Fixed make flags for rvm
Merge branch 'master' of github.com:phillipoertel/dotfiles
Disabled new git setting until I've upgraded