Fix source no longer working in zsh/bash
Add divergence, goodness, and mergetool from garybernhardt's repo
Stop trying to use a mouse in vim, it's screwy.