updated .emacs
Merge branch 'master' of http://github.com/bcforres/unix_configs