Marmalade
Merge branch 'master' of https://github.com/RobBlackwell/dot-emacs

Conflicts:
	init.el