vimwiki definitions
Merge branch 'master' into ccap
ccap wiki comes first at work