s/enum/typedef enum/g on uniform_t for glorious fix of mac build. h/t MAN-AT-ARMS
Cross compiling for OS X
Fix some of the things clang --analyze flagged
Fix the warning caused by fixing the warnings
Merge remote-tracking branch 'upstream/master'

Misc upstream updates.