Lots of updates - better functionality, more unit tests working.
:stubbing out unit tests until they can be properly fixed.
Merge branch 'feature/query-service-refactor' of github.com:zenoss/query into feature/query-service-refactor