Added several general improvements to vimrc