Cleaned up the .vimrc a bit.