Merge It

[billroper]

I have merged the "big" project that my coworker and I have been heads down on for the last several weeks into the "huge" project that we calved it off from. The code for a couple of subsystems has been substantially cleaned up and a number of new features added, as I kept proposing small bits of additional feature creep while we were in the area. These were features that our customers were asking for, so I don't feel bad about this particular creep.

The huge project is moving toward release and now our changes have joined this giant barge as we maneuver it towards the locks. This is a good feeling. :)