fixed conflict
.bashrc
.gitignore_for_all
.vimperatorrc
.vimrc, from darwin11