Merge branch 'master+travis-production'

.travis.yml

@@ -1,3 +1,6 @@
+dist: trusty
+sudo: false
+
 language: python
 python:
   - '3.4'
@@ -27,7 +30,5 @@ deploy:
     condition: $(python3 -c 'import re,os; print(bool(re.match(r"^(\d+\.){2,}\d+$", os.environ.get("TRAVIS_TAG", ""))))') == "True"
     python: '3.6'
 
-  skip_upload_docs: true
-
 notifications:
   email: false

setup.py

@@ -32,7 +32,7 @@ with open('__init__.py', 'w') as f:
 # Convert Markdown to RST for PyPI
 try:
     import pypandoc
-    long_description = pypandoc.convert('README.md', 'rst')
+    long_description = pypandoc.convert('README.md', 'rst', format='markdown_github')
 except ImportError:
     print('WARNING: PyPandoc not available; skipping writing long description.')
     long_description = None