add .vimrc.local
Merge branch 'master' into mac