Added scalatest dep
changed formatting
Patched an ivy dependency issue involing google-guava
Some minor formatting changes