Coveralls setup
Update Ruby in Travis to 2.1.2
Merge branch 'master' into gterm

Conflicts:
	.travis.yml
	Gemfile.lock
	spec/rails_helper.rb