Update default Rails to 4.1.6
Merge Rails 4.1.6 update into devise-omniauth-saml

Conflicts:
	Gemfile.lock