Scala: Stricter Scalafmt settings.

Change-Id: Ic84d59edebba6dde5f26ca910fa05d9033b1078e
diff --git a/.scalafmt.conf b/.scalafmt.conf
index a1fde4d..20d91a4 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -2,3 +2,7 @@
 maxColumn = 100
 docstrings = JavaDoc
 assumeStandardLibraryStripMargin = true
+rewrite.rules = [AvoidInfix, PreferCurlyFors, RedundantBraces, RedundantParens, SortModifiers, SortImports]
+rewrite.redundantBraces.generalExpressions = true
+trailingCommas = preserve
+optIn.forceBlankLineBeforeDocstring = true