helpers for reactive defense
fix conflicts
more progress on reactive defense, refactoring fleet to include jump prep time
Merge branch 'master' of github.com:bpodgursky/hubris
fix conflicts