Revise indent of vimrc files
Merge branch 'master' into mac