Upgrade Spark API.
Merge pull request #238 from rxin/upgrade

Upgrade Spark API.
Merge remote-tracking branch 'upstream/master'