re-org .emacs
...
Merge branch 'master' of github.com:jbalint/dotfiles

Conflicts:
	configs/emacs.d/.emacs