remove now-unnecessary additional resolver
upgrade to ScalaTest 2.0.RC3
minor cleanup
use sbt 0.13 macro syntax in a few more places
Merge branch 'headless' into tortoise
use sbt 0.13 macro syntax