stuff
new brew packages
Merge branch 'master' of github.com:simonhicks/dotfiles

Conflicts:
	emacs.el
undo broken stuff in emacs.el