Merge pull request #7 from rtsuk/master

sync master down to fork.
Adding code to include fleet captain cost.
Making fleet captain remove faction penalty from captains
updating to common interpretation of fleet captain rule
Merge pull request #107 from tblackwe/master

Fleet captain fix and possible fix