MBH: its my friday
Merge branch 'master' of github.com:mattben/vimwiki