update .emacs for mac with version 24.4
Merge branch 'master' of https://github.com/oracleyue/dotfiles