(NOJIRA) style, spacing
MAHOUT-1597: A + 1.0 (fixes)
Merge branch 'master' into spark-1.0.x