update vimrc.lock
Merge branch 'square-master' into my_custom