Merge branch 'hotfix/rvm'
ubuntu may use a bashrc file instead of bash_profile
Merge branch 'hotfix/rvm' into develop