Update Gemfile
Fix tests
Add .rvmrc file
Merge branch 'staging' of github.com:davidpiegza/rails_playground into staging

Conflicts:
	Gemfile
	Gemfile.lock
	spec/requests/authentication_pages_spec.rb
	spec/requests/user_pages_spec.rb
Fix tests