modified rvm files
modified gemfile.
upgraded to Rails4
merge.
added deprecation warnings.