Added support for DiffMerge on Mac
Automatically configures git to use DiffMerge by default, but can be disabled with attributes
Change use of 'node' configuration to avoid Chef warning
Added checksum for diff_merge recipe
Merge branch 'pivotal-diffmerge'

Conflicts:
	recipes/diff_merge.rb