make release-tag: Merge branch 'master' into stable

.gitignore

@@ -92,7 +92,7 @@ instance/
 .scrapy
 
 # Sphinx documentation
-docs/build/
+docs/_build/
 docs/modules.rst
 docs/atm.rst
 docs/atm.*.rst
@@ -136,3 +136,6 @@ ENV/
 
 # mypy
 .mypy_cache/
+
+# pid
+*.pid

.travis.yml

@@ -0,0 +1,27 @@
+# Config file for automatic testing at travis-ci.org
+language: python
+python:
+  - 2.7
+  - 3.5
+  - 3.6
+
+# Command to install dependencies
+install:
+  - pip install -U tox-travis codecov
+
+# Command to run tests
+script: tox
+
+after_success: codecov
+
+deploy:
+
+  - provider: pages
+    skip-cleanup: true
+    github-token: "$GITHUB_TOKEN"
+    keep-history: true
+    local-dir: docs/_build/html
+    target-branch: gh-pages
+    on:
+      branch: master
+      python: 3.6