indent and improvements to vimrc