Update vimrc and emacs
Merge branch 'master' of github.com:zph/zph