Sorry the .gitignore change was me trying to sneak in vi friendliness. The composer.json change I thought was necessary but forgot about the composer require wp-cli/wp-cli:dev-master in .travis.yml. I've removed both.

For stuff like the vi files, you should put rules into your global git ignore file instead: https://help.github.com/articles/ignoring-files/#create-a-global-gitignore

Just do this once, and you'll never have to worry about them again.