Added some plugins and corrected vimrc
Merge branch 'master' of https://github.com/waytoheaven/vim