Added support for diffmerge and boxen in gitconfig

Both of them are conditional on the existence of those tools.
Merge branch 'master' of github.com:cander/dotfiles

* 'master' of github.com:cander/dotfiles:
  Fixed dumb quoating issue in cd function.