linting
Merge branch 'master' of github.com:pwmckenna/generator-travis-ci