Updated plugins
Merge branch 'master' of https://github.com/amix/vimrc
Merge branch 'master' of github.com:veggiemonk/vimrc