Removed All references to the Spout class execpt EngineFaker
Merge pull request #600 from Waterpicker/master

Removed all but one reference to the Spout class