Update .emacs

merging home and work files