Changes to make things compile on OSX 10.10 --- not a fan
Builds and runs on OSX --- FINALLY
Merge branch 'osx_build_fun' into develop
Merged develop with osx_build_fun