Clean up
Merge branch 'master' of github.com:zhensun/dot-emacs