Fix Swat dependancy

This is needed for various AdminObjectEdit updates (#11, #13 and #18), and the killing of package_id cruft (#14).