Updating .emacs with latest stuff from work