Use OS X FileMerge as gui diff and merge tool
Merge branch 'master' of github.com:ivalkeen/dotfiles