Updates to work with Xcode 6.1
Merge pull request #3 from dtiesling/dt_wip

Updates to work with Xcode 6.1