changed shelfwater, slopewater defn to be consistent with water_census
Merge branch 'master' of github.com:dcherian/eddyshelf
Merge branch 'master' of github.com:dcherian/eddyshelf
better algorithm - results in cleaner vormask contours. Also modified to use rho fields from history files if available. that capability hasn't been checked yet