Update
Updated model
Changed Var Names
Topview of water finished
Update at sigma->inf

Keep the changes in eta_0, eta_bound, and trapF.

For tempModel keep the changes in model but kill the plotting changes
Small changes to plotting.
Merge branch 'Matt's-branch'