removed osx settings from linux branch
Merge branch 'linux' of github.com:dpfranklin/dotfiles into linux

* 'linux' of github.com:dpfranklin/dotfiles:
  added git config diff and merge tools