Merge branch 'master' into develop

This gets v2.0.1 bugfix onto develop
* master:
  Fix ocean penetration bug
  Add stop to parallel_slap.F90 parallel_stop()
  Adding empty directory to Ross test case
fix hdf5 and netcdf modules now that edison has fixed their hdf5 issue
Merge branch from DanFMartin

  fix hdf5 and netcdf modules now that edison has fixed their hdf5 issue