Updated config for emacs 24.4

Update includes a general cleanup as well as use of new cider
functionality.