bring back Query.scala which seemed to have gotten lost
update to build 2.10 properly