Making some changes to work better on OS X
Merge branch 'master' of github.com:jamesfrank/Dotfiles