Revise to readable vimrc
Merge branch 'master' into mac