Merge branch 'cyrus' of github.com:verdammelt/dotfiles into cyrus

Conflicts:
	.emacs.d/init-misc.el