missing import in geoplot.discrete_cmap2
fgmax_tools: fix fname to input_file_name
dtopotools.convert_to_standard_units should loop over input_units keys
change number of fgmax grids allowed from 2 to 5 by default
Merge pull request #121 from rjleveque/fix_5.2.1

Fix 5.2.1
fixed a number of bugs in fgmax_tools.py for point_styles other than 2, which had not been exercised
Merge pull request #123 from rjleveque/fgmax_tools_fix

fixed a number of bugs in fgmax_tools.py
Merge remote-tracking branch 'dlgeorge/1D' into rjleveque/1D to incorporate
changes for release of 5.2.2.

* dlgeorge/1D:
  Geoclaw 1d: adding plot functions
  1D geoclaw routines: obvious bugs removed
  set up 1D shallow-geoclaw src routines
  added equivalent of classic/1d code for shallow water...geoclaw module not added yet
  Merge branches 'master' and 'master' of git://github.com/clawpack/geoclaw
1d geoclaw/swe adding coulomb friction option
1d geoclaw: adding 1d example app