Changed things around a bit, adding some new plugins
Merge branch 'master' of https://github.com/Kroogs/vim-setup