Ray tracing demo: Even more documentation on those sampling functions.
Merge remote-tracking branch 'upstream/master' into travis-osx