Added a few plugins, tidied up .vimrc