Don't store Photon parameters in the Scenery object, but directly in the Photon template it holds. This avoids getting out-of-sync.
Merge branch 'master' into odeint

Conflicts:
	include/GyotoScenery.h
	lib/Scenery.C
	lib/Worldline.C