Changes to build using scala 2.9.  Switched testing to spec2