WIP. Get Xcode 6 working.

Updates the instruments build number, and handles 'instruments -s' failing
to tell us the path to Automation.tracetemplate.