Cleanup after install on new macbook
Merge branch 'master' of https://github.com/pragtich/dot-emacs

Conflicts:
	emacs.el
	emacs.org
	init.el