description of ascii file format
fixes to ascii description and index
Merge branch 'parallel-syntax' of git://github.com/ketch/visclaw into geoclaw-fixes
Merge branch 'clawpack-trunk' into geoclaw-fixes
Merge remote-tracking branch 'upstream/master' into rjl

* upstream/master:
  Fix calling signature for GaugeSolutions
  Reorder geoclaw plotting tools
  This updates visclaw to reflect changes to PyClaw's Patch and Grid classes.
  Correctly import setplot_default and remember to actually call setplot().
  Fix typo in level_params.
  format -> file_format
  Clean up frametools.py.
Inital cp of plotfg from claw-4.x
Fixed grid plotting completes, not tested
Flip indices
Add fixed grid plotting
Merge branch 'fixed-grids' into geoclaw-fixes
Changed grid to patch a couple places: 2d_grid to 2d_patch
and grid_edges to patch_edges
Merge remote-tracking branch 'upstream/master' into rjl

* upstream/master:
  visclaw -> clawpack.visclaw
  fixed syntax error
  massive restructuring to clawpack.visclaw
  pip install develop/-e now working
  added setup.py for scipy style builds
  fixed copy-pasta README.txt
Merge branch 'master' into geoclaw-fixes
Fix import from visclaw
Merge pull request #23 from mandli/data-import-fix

Fix import from visclaw
Merge pull request #22 from mandli/geoclaw-fixes

Fixed Grid Plotting
Import bug fix
Merge remote-tracking branch 'rjl/rjl'

Need 2d_patch plot_type for proper plotting so merging with from Randy's
branch.
Merge pull request #24 from mandli/master

Add some plot_types from rjl/rjl
Refactor data objects for new clawdata

Includes refactoring of gauge data objects located in clawutil as well