Removed slipped comment
Updated license comment
Generified QueryResult
Make sure we have only one version of Jackson on the classpath
Major test cleanup