Use a version of mocha working with every rails version

Conflicts:
	Gemfile
	Gemfile.lock