Fix hipchat recipe when never started

Signed-off-by: Abhijit Hiremagalur <abhi@pivotallabs.com>
Update Textmate2

Signed-off-by: Caleb Miles <cmiles@pivotallabs.com>
~/.vagrant.d should not be owned by root

Signed-off-by: Caleb Miles <cmiles@pivotallabs.com>
Cope reorganization in Pivotal Rubymine preferences repo

Signed-off-by: Caleb Miles <cmiles@pivotallabs.com>
Merge upstream/master