Too much time passed since last push.
Forgot to push meanwhile. Mainly moved .el into a separated folder so they don't float around.
Merge branch 'master' of github.com:lazywithclass/dotfiles

Conflicts:
	emacs.d/init.el