Cleanup and massice upgrade to .vimrc, hoorah