#569: Reworked the options name for war and warLocation. Polished the usage. Make sure warLocation take precedence over war, so you can override it.