Source RVM properly
Merge branch 'master' of github.com:mg6/dotfiles
Update per type indentation