Removed the query plugin, which seems pointless
Bumped version to 2.1. This is (internally) a big change, although externally should be little change visible