updated vimrc for easy indenting
updated vimrc after merge conflict