Merge branch 'master' into devel
Comment out experimental psf masking for now
Reset defaults to match old runs for now
Add option to specify beam threshold used for calibration sources
Merge branch 'master' into devel
Merge branch 'devel' into devel2