Delete ..vimrc (guangbos-MacBook-Pro's conflicted copy 2013-09-13).un~