Added rvm-capistrano. Updated deploy file to set rvm information
Merge branch 'develop'