Update for the Modularization of Spout and fix most of the simple physics changes

Signed-off-by: Jack Huey kitskub@gmail.com