OSL merge #11

Added missing Closure -> BSDF conversions, bug fixes and formatting fixes.