Added .rvmrc file for better environment management via RVM
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	login_spec.rb
Removed superfluous require 'rubygems'