Merge branch 'dev' to get updated sky spectra units
Merge branch 'dev'
fix PSF location bug at lower edge of CCD
Merge branch 'master' into dev