Add BUNIT keyword to output FITS files to specify units
Add tag 'gain' to source component lists
Fix merge conflicts