minor typos fixed
fix a NPE leading to broker 500 response
Merge branch 'master' into igalDruid
switched operations and ingestion sections
Merge pull request #461 from metamx/igalDruid

Igal druid
Merge pull request #460 from liquidm/fix_npe_in_groupby

fix a NPE leading to broker 500 response
make index file acl consistent with descriptor
enforce acl on object move
Merge pull request #462 from metamx/s3-consistent-acl

S3 consistent ACLs
fix missing arg
Merge pull request #463 from metamx/s3-consistent-acl

fix missing arg
fix context to be backwards compat
cleanup
be able to set maxPendingPersists in plumber
fix query forwarding
fix case with no request params
docs: correcting path to index file
Merge pull request #465 from jonchase/feature/docs_typo

docs: correcting path to index file
make query id a bit more readable
Merge pull request #464 from metamx/fix-context

Fix context to be backwards compatible with String values