Attempting fix of repo after confused rebase - iteration 3
Attempting fix of repo after confused rebase - iteration 4
EOD: Basic tests pass again; TODO: test irrigation and NetCDF4 functionality