restored and improved formatting in .vimrc