mybashrc: fix typo
myvimrc: go back to wrapping lines
3-way merging and diffs