relax Poissonian assumption in PSHA chapter
fixed merge conflicts
additional corrections
Merge pull request #18 from GEMScienceTools/psha_chap_v2

Describe PSHA equation also without Poissonian assumption
Merge branch 'master' of github.com:GEMScienceTools/hazard_book_2014 into review_chap6