Updated vimrc to use plugin manager, and fixed up a few things
A few more updates to vimrc