Factor out the bull into its own class
Merge branch 'master' into camera-centering

Conflicts:
	NEPTUNE/NPCaveScene.m