removed reference to rvm
Merge branch 'master' of https://github.com/joshfry/dotfiles
Update stuff