Cleanup and improve .vimrc