a lot of fixes and updates across many resources to match katello updates
Merge pull request #41 from thomasmckay/import

a lot of fixes and updates across many resources to match katello update...