Minor style cleanup.
scalastyle checks for sbt. All warnings for now. Execute using 'sbt scalastyle'

Conflicts:
	project/SharkBuild.scala
Warnings now errors. Disabled cyclomatic complexity