Fixed conf/slaves and updated docs.
Merge branch 'driver-test' of github.com:tdas/incubator-spark into driver-test