Add fishing mortality MCMC output to mcmc_output() function.
Conflicts fix.
Fixed some whitespace issues
Merge remote-tracking branch 'cgrandin/IPHC-developer' into IPHC-developer
Merge with cgrandin