Fixed Some Oversights

Fixed tiny errors and small oversights that would have made merging a
bit more difficult.
Military AI Tweaks

Changes to calculating potential targets, military units wanted, when to
disband units, what units to disband, air units for intercepts, etc.