Updates for rvm and heroku

Declares ruby version in the Gemfile for heroku
Switches ruby switching type to new style
Merge branch 'develop'