Updated plugins
Merge branch 'master' of github.com:amix/vimrc
Updated plugins
Merge branch 'master' into personal