netcdf addition
Merge branch 'master' of git.lanl.gov:vvv/mads

Conflicts:
	ds/infogap.c
	mads.c
	mads.h
	mads_io.c
	makefile

Resolved conflicts.  Trying to merge.
Merge branch 'master' of git.lanl.gov:vvv/mads