Ugly merge
Merge branch 'master' of https://github.com/Rovanion/.files

Conflicts:
	.emacs.d/init.el