Merge pull request #228 from pwendell/master

Document missing configs and set shuffle consolidation to false.
(cherry picked from commit 5d460253d6080d871cb71efb112ea17be0873771)

Signed-off-by: Patrick Wendell <pwendell@gmail.com>