bump rails to 4.1.4 and add google omniauth
Merge branch 'master' of github.com:ja999/achievementguru

Conflicts:
	Gemfile