Change patch file order to insure Statistics 1.11 compatibility
Import the ScriptRunner from the master branch
Re-work the Query classes
Move some things around