Putting my updates into the main mod

There are a few issues I can't really reproduce with some of the upgrades, but for the most part I think it's ready to be put into the main repo.

I changed the formatting on everything, added some upgrades back in, and generally re-added old features.
Also, the Clay Soldier API kind of works!  See Cliffie's Decor for proof, it adds custom soldiers.