Add WarTrauma and CanopyWarfare maps, fix lost commits from internal code refactor

This commit was a tight squeeze. Stupid internet going off.