Update deprecated API Query calls

Removed rvtoken and replaced intoken uses with uses of its new
apropriate equivalents.
Merge pull request #126 from m4tx/master

Update deprecated API Query calls