Merge pull request #22 from MaddTheSane/BackToGabu

Still more OS X changes
Merge pull request #24 from MaddTheSane/BackToGabu

Minor OS X maintenance
Merge branch 'BackToGabu'
Remove deleted file from Xcode.