Merge pull request #68 from PierreR/master

Apply optparse change to pdbquery
Tentative filtering of json output
Make sure we always save the raw catalog to the puppet db
Rename _testusergroups, _factsDef and _factsFile
Remove dead code