sync emacs-prelude upstream
update vim modules
Merge branch 'master' of github.com:zhengyi13/dotfiles