Document missing configs and set shuffle consolidation to false.
Small changes from Matei review
Forcing shuffle consolidation in DiskBlockManagerSuite
Merge pull request #228 from pwendell/master

Document missing configs and set shuffle consolidation to false.
jobWaiter.synchronized before jobWaiter.wait
FutureAction result tests
Merge pull request #232 from markhamstra/FiniteWait

jobWaiter.synchronized before jobWaiter.wait

...else ``IllegalMonitorStateException`` in ``SimpleFutureAction#ready``.
Merge remote-tracking branch 'upstream/master'