Build against Scala 2.10.4.
Backport Scalatest upgrade from 2.11 branch to minimize delta.
Merge branch 'scala_2.10' into scala_next

Conflicts:
	pom.xml
	scalate-util/pom.xml
	scalate-util/src/test/scala/org/fusesource/scalate/util/FunSuiteSupport.scala