Restored compute_hazard_curves to the poissonian form
Fixed compute_hazard_curves
Fixed conflicts
Merge pull request #1362 from gem/restored-

Fixed a stupid error in compute_hazard_curves