Merge branch 'nginx-checkout' of https://github.com/nlake44/appscale
Merge branch 'master' of https://github.com/AppScale/appscale
Merge branch 'master' of https://github.com/AppScale/appscale
adding limit to zig zag queries
Merge pull request #1518 from AppScale/limit-on-zig-zag

Limit on zig zag queries
Recreating bootstrap.sh
Removing reference to different DB: only cassandra.
Merge pull request #1521 from obino/bootstrap

Bootstrap
Merge remote-tracking branch: upstream/master