Cleaned up .vimrc a bit