Merge branch 'master' into unicode-object-id

.coveragerc

@@ -0,0 +1,6 @@
+[run]
+branch = True
+source = src
+
+[report]
+precision = 2

.gitignore

@@ -1,19 +1,25 @@
 *.egg-info
 *.py?
+.Python
+.coverage
+.coverage.*
 .installed*.cfg
 .mr.developer.cfg
 .tox
 /bin/
 /build/
-/develop/
 /develop-eggs/
+/develop/
 /dist/
+/docs/.build/
+/docs/_build/
 /eggs/
 /etc/
+/htmlcov/
 /include/
 /lib/
 /log/
 /parts/
 /var/
-/docs/_build/
-/docs/.build/
+coverage.xml
+pip-selfcheck.json

.travis.yml

@@ -2,17 +2,19 @@ language: python
 sudo: false
 python:
     - 2.7
-    - 3.4
     - 3.5
     - 3.6
 install:
     - pip install -U setuptools==`grep setuptools versions.cfg | awk '{print $3}'`
+    - pip install six==`grep '^six' versions-prod.cfg | awk '{print $3}'`
     - pip install zc.buildout==`grep '^zc.buildout' versions.cfg | awk '{print $3}'`
+    - pip install coveralls coverage
     - buildout bootstrap
     - buildout install test alltests
 script:
-    - bin/alltests -v
+    - coverage run bin/alltests -v
 after_success:
+    - coveralls
     # Bails out for non-tags
     - ./update_index.sh
 notifications: