Workaround for Minitest, Travis CI, Bundler issue
Cleaning up an 'amend' problem with git

Conflicts:
	.travis.yml