Fixing premature merge 

-- can clean up after clawpack/geoclaw#80 is merged