Add gitx recipe
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/osx.json
	cookbooks/realityforge_workstation/attributes/default.rb
	cookbooks/realityforge_workstation/recipes/intellij_ultimate_edition.rb
	cookbooks/realityforge_workstation/recipes/rbenv.rb
	cookbooks/realityforge_workstation/recipes/workspace_directory.rb