Changed build matrix for travis
Merge branch 'master' of github.com:mitsuhiko/flask