Changes for Spark 1.0
Merge pull request #49 from pwendell/v3

Support for Spark 1.0 configurations.