Fiddled with .emacs, more stuff added to setup