Try fixing travis.

Conflicts:
	Gemfile