Updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	netCDF_Instrument/NetCDF_Utils/slurp.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	netCDF_Instrument/NetCDF_Utils/slurp.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	netCDF_Instrument/NetCDF_Utils/slurp.py