[2014-3-9]Updated for daily work.
Merge branch 'master' of https://github.com/zjunweihit/vimwiki