cleanup
Merge branch 'master' of github.com:netpyoung/netpyoung.emacs.d