Merge pull request #125 from dlgeorge/1D

1 d geoclaw
Merge remote-tracking branch 'origin/1D' into 1D