lint
travis test
Merge branch 'master' of https://github.com/pwmckenna/generator-travis-ci