Merge branch 'master' of github.com:afourney/pyra
Added partial support for gcl query parsing.