Minor Spout cleanup.
Cleaning up our UnarmedManager
Small TamingManager changes. Halting the rest of the major changes for
now to prepare for 1.4.00 release.