format .travis.yml correctly
Merge branch 'master' of github.com:twitter/flight