Cycles OSL: update to build with latest OSL master shader group changes.
Scons: as requested by Ideasman, make MACOSX_COMPILER -> C_COMPILER_ID,
leave env set for OSX exclusive for now”
Merge branch 'master' of http://git.blender.org/blender