Starting work on emacs configs
Merge branch 'emacs-dotfiles' of github.com:schober/dotfiles into emacs-dotfiles

Conflicts:
	emacs