Add vimwiki settings
Merge branch 'vimwiki'