Work on adding a combat model

Intended to replace Army Demo. Cleaned up a lot of the code, added some
libraries so we're not recoding everything in every file.