Code formatting tweaks.
Converted subproject to specs2 from scalatest.