Merge latest skeleton

Signed-off-by:

Author: pombredanne

setup.cfg

@@ -6,6 +6,7 @@ license = Apache-2.0 AND CC-BY-4.0 AND LicenseRef-scancode-other-permissive AND
 # description must be on ONE line https://github.com/pypa/setuptools/issues/1390
 description = ScanCode is a tool to scan code for license, copyright, package and their documented dependencies and other interesting facts.
 long_description = file:README.rst
+long_description_content_type = text/x-rst
 url = https://github.com/nexB/scancode-toolkit
 
 author = nexB. Inc. and others