Plugin cleanup, added vimwiki definitions.