Remove history_settings which does not have a template.
Extract email domain in git_script_pairs.erb to an attribute 'git_pairs_domain' in node.default so that it can be easily overwritten.
Also access node in consistent manner.
Extract machine domain in rename_machine recipe to an attribute in node.default so that it can be easily overwritten.
Also access node in consistent manner.
Working on my system
Properly configure WS_HOME variable when always_set_home or env_reset is configured in sudoers, as is the case for CentOS 6
Change '== "ubuntu"' to '!= "mac_os_x"' to enable support for CentOS
Merge pull request #197 from webcoyote/centos

Fixes for CentOS
Enable default workspace directory to be overridden for each project synced using git_projects recipe
Added rvmrc
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
Merge branch 'master' of https://github.com/pivotal/pivotal_workstation into issue/fix-bash-it-custom-plugins
Added checksum for diff_merge recipe
Merge pull request #194 from kunday/issue/fix-bash-it-custom-plugins

Fix bash_it chef recipe: remove history_settings which does not have a template.
Merge pull request #195 from neo/extract_machine_domain

Extract 'pivotallabs' in rename_machine.rb recipe
Merge pull request #196 from neo/extract_git_pair_domain

Extract 'pivotallabs' in git_script_pairs.erb template
Merge pull request #201 from webcoyote/pivotal-rvmrc

Update rvmrc to match latest Ruby version (1.9.3-p374)
Initialise and update git submodules recursively
Document git_projects configuration format for new users
Fixed file ownership problem for .gitconfig file by setting 'user' to 'WS_USER' for command execution