update to support Xcode 6.1b3
Merge pull request #139 from orta/xcode-6.1

@mattt => update to support Xcode 6.1b3
Xcode 6.1 GM fixes
Merge pull request #143 from nduplessis/xcode-6.1

Xcode 6.1 GM fixes