Updating Makefiles.
Submodule update.
Adds (trivial) "-ocean given" and "-ocean pik" cases.