Merge pull request #518 from joshk/patch-1

Use the new build env on Travis
Conflicts:
	.travis.yml

.travis.yml

@@ -1,14 +1,14 @@
 language: python
+
+sudo: false
 env:
     - TOXENV=py26
     - TOXENV=py27
     - TOXENV=cover
-    # - TOXENV=pypy
-    # - TOXENV=py32
-    # - TOXENV=py33
-    # - TOXENV=py34
+
 install:
     - travis_retry pip install tox==1.6.1
+
 script:
     - travis_retry tox
 notifications: