Fix mac build errors.
Merge branch 'reorg' of github.com:dennisferron/GameBindings into reorg