SPARK-1058, Fix Style Errors and Add Scala Style to Spark Build.