Merge branch 'update-iterm-attributes' into mike-customizations

Conflicts:
	sprout-osx-apps/attributes/iterm2.rb