toConstructor() working and tests written

passing all tests. Additional fixes for dealing with `sort` passed via
`setOptions` Moral of the story: the storage format for sort sucks
Updated mquery version, removed sort hacks

Updated to new mquery version which gets rid of the terrible internal
sort syntax.