Miscellaneous cleanup from testing
Merge branch 'master' of https://github.com/schwarherz/CK2PlusRedo