xcode6 compilation fixes
Merge pull request #222 from trailbehind/feature/xcode6

Xcode6 compilation fixes