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

@pwandell Can we merge this in parts and soon, this is very prone to merge conflicts.