Added vim-notes support
Merge branch 'master' into vim-notes-support
~