Merge pull request #181 from dcrissman/master

Make JsonProvider more re-usable
Merge pull request #2 from candlepin/master

pull master changes