organizing elisp.  Works when launched from emacsclient -t
Merge branch 'master' of github.com:localredhead/prelude_personal

Conflicts:
	mod_emacs.el
	mod_prelude.el