Upgraded to spark 1.0
Merge pull request #830 from lossyrob/master

Upgraded to spark 1.0