Update
Merge branch 'master' of https://github.com/wfarr/dotfiles

Conflicts:
	emacs.d/init.el