updated .emacs
Merge branch 'master' of github.com:bingxiao1/emacs