fixed class declaration
more multi-uv merge fixes
OSX yosemite build fixes/updates