Merge branch 'wip'
Added mustache spec submodule
Removed simple query path
Revert 7c0eb35..d4b2838

This rolls back to commit 7c0eb35ecdfa9501f56849faea4f193fa8c1987e.
Revert
Merge branch 'wip'
Merge branch 'wip'
wip
wip2
Merge branch 'master' into wip