Merge remote-tracking branch 'origin/master' into python-v3

Author: bear (Mike Taylor)

.travis.yml

@@ -0,0 +1,18 @@
+language: python
+sudo: false
+python:
+  - "2.7"
+  - "3.5"
+
+before_install:
+  - pip install codecov
+
+install:
+  - travis_retry pip install .
+  - pip install -r requirements.txt
+
+script:
+  - nosetests
+
+after_success:
+  - codecov