Merge branch 'master' of github.com:jaypei/exz_conf
upgrade vimwiki
Merge branch 'master' of github.com:jaypei/exz_conf