Makefile updates, Minor updates

Merged Alexander van Heukelum (TriOpSys) requested to merge updates into master

Makefiles: updates to allow building helper executables on the new server MERRA: point to updated URL (the previous one is removed) CMIP6: spelling CMIP5 -> CMIP6