Re #302: Handle units being added to army * Switch to a method that matches WinForms - cache objects in a dictionary rather than searching for them, since we can then work by object instead of relying on unit name Also: * Minor code clean-up