MBH: today is a good day
Merge branch 'master' of github.com:mattben/vimwiki