Modernize python versions on travis

.travis.yml

@@ -1,7 +1,8 @@
 language: python
 python:
-  - 2.6
   - 2.7
+  - 3.5
+  - 3.6
   - pypy
 script:
   - pip install nose coverage pep8 setuptools-flakes

pre-commit-check.sh

@@ -1,18 +1,14 @@
 #!/bin/bash
 # TODO: stash changes before doing tests: http://codeinthehole.com/writing/tips-for-using-a-git-pre-commit-hook/
 
-function handle_exit {
-    if [ $? -ne 0 ]; then
-        EXITCODE=1
-    fi
-}
+set -xe
 
 echo '====== Running tests ========='
-bin/nosetests; handle_exit
+nosetests
 
 echo '====== Running PyFlakes ======'
-bin/python setup.py flakes; handle_exit
+python setup.py flakes
 
 echo '====== Running pep8 =========='
-bin/pep8 src/pyramid_marrowmailer; handle_exit
-bin/pep8 *.py; handle_exit
+pep8 src/pyramid_marrowmailer
+pep8 *.py