Merge pull request #11 from AppScale/testing

master merge
fix for zigzag queries
Merge pull request #715 from nlake44/zigzag-fix2

Fixing hash issue in zigzag queries