Merge branch 'master' of github.com:TheBB/dotfiles

Conflicts:
	emacs/init.el