Scala 2.11 Support in Spark

This is a small modification to @ScrapCodes existing pull request.