Ensure magit works with homebrew installed emacs on OS X
Merge branch 'master' of github.com:wtfleming/dotfiles