Add .rvm helper files
Update .ruby-version to 2.1.1
Merge branch 'master' into awesome-job