Fourier edit
Merge branch 'master' of https://github.com/cmazzullo/wave-sensor

Conflicts:
	netCDF_Instrument/NetCDF_Utils/slurp.py