Git gem better
I don't think this will Travis
Merge branch 'master' into use-git-gem

Conflicts:
	Gemfile