Major refactor. APIs not affected. Added ability to specify custom query builder to the grid see issue #17