Allow exporting and importing OS X substitutions

- also add `simplify` function, and `gdt` shortcut for `git difftool`
Merge branch 'master' of https://github.com/geoffstokes/dotfiles