edits to query language
rbenv version file
Merge branch 'master' into stage