Don't autorebase
Merge branch 'master' of github.com:tomfitzhenry/dotfiles
Add rvm to .profile