Add note about needing to learn to use vim for 3-way diff/merges