Commented out things that are not ready
Merge pull request #50 from spark/master

Commented out things that are not ready