sbt 2.10.4 for travis builds [ci skip]
Expression cleanup