ftplugin/wiki.vim: minor change
Merge branch 'master' of github.com:lilydjwg/dotvim
new config for new surround