Even better handling for --catalog option
Even better handling for --catalog option

Use aamporter.plist's catalog first if set, then munkiimport default_catalog if it is set, and lastly falls back on munkiimports default of 'testing'.
n8felton/aamporter,timsutton/aamporter