emacs.el cleanup
Merge branch 'master' of github.com:svenwelte/punktkonfig

Conflicts:
	vimrc