Cleanup vimrc a bit