Ugh, git doesn't really ever delete anything, does it? Duplicates should be removed now... Also put scene.cpp on a diet: moved all trace-code to Scene::trace(ray, *object).