Fixed up some stuff on the mac. Sort of.
Merge branch 'master' of github.com:atubbs/dotfiles