Fixing up the OSX build
Merge github.com:bmenke92/GameLib into HEAD