Moved heroku and rvm settings

Change-Id: Ifdf657591e626473537abab65463473d8d894039