Cleaning up config for Emacs24 and  emacs-starter-kit v2