merge everything
remove trailing comma from query. jump to query token. added test.
Merge pull request #46 from rueckstiess/45-query-comma

remove trailing comma from query. jump to query token. Fixes #45.