Add vim-ref
Merge branch 'master' into mac