Working on fishing mortality rate constraints and penalties
Added counter for number of estimated F's required
Merged in Athols changes