fixes for xcode 6.1 changes
Merge pull request #2 from vinnyt/xcode6.1fixes

fixes for xcode 6.1 changes