cleaned up .emacs and re-organised .emacs.d