Added rvm
Merged master
Changed .rvm in .bashrc to point at /home/marshall instead of /home/marshall