Merge pull request #72 from ericcj/master

Auto-pointerize in queries and saves
Merge remote-tracking branch 'adelevie/master'
Merge branch 'master' into forked_stuff