fix travis.yml to use the correct TOXENV var
Merge branch 'master' of https://github.com/Pylons/pyramid into fix_proutes_coverage