merge
Merge branch 'master' of github.com:hostmaster/emacs.d

Conflicts:
	init.el