Merge pull request #1358 from RonnyPfannschmidt/features

merge features into master to begin the 2.9 line

Author: nicoddemus

.travis.yml

@@ -10,7 +10,7 @@ env:
     # coveralls is not listed in tox's envlist, but should run in travis
     - TESTENV=coveralls
     # note: please use "tox --listenvs" to populate the build matrix below
-    - TESTENV=flakes
+    - TESTENV=linting
     - TESTENV=py26
     - TESTENV=py27
     - TESTENV=py33

AUTHORS

@@ -26,8 +26,10 @@ Daniel Grana
 Daniel Nuri
 Dave Hunt
 David Mohr
+David Vierra
 Edison Gustavo Muenz
 Eduardo Schettino
+Endre Galaczi
 Elizaveta Shashkova
 Eric Hunsberger
 Eric Siegerman
@@ -45,6 +47,7 @@ Jaap Broekhuizen
 Jan Balster
 Janne Vanhala
 Jason R. Coombs
+Joshua Bronson
 Jurko Gospodnetić
 Katarzyna Jachim
 Kevin Cox
@@ -55,6 +58,7 @@ Marc Schlaich
 Mark Abramowitz
 Markus Unterwaditzer
 Martijn Faassen
+Michael Aquilina
 Michael Birtwell
 Michael Droettboom
 Nicolas Delaby