Fixing premature merge -- can clean up after clawpack/geoclaw#80 is merged
Merge pull request #78 from rjleveque/surge-unmerge

Fixing premature merge