Merge branch 'master' of github.com:hanslovsky/config

Conflicts:
	dotfiles/.emacs