upgrade to Scala 2.10.4-RC1
upgrade to Scala 2.10.4-RC2
upgrade to Scala 2.10.4-RC3
Merge branch 'master' into scala-2.10.4

Conflicts:
	.travis.yml
upgrade to Scala 2.10.4
Merge pull request #2 from SethTisue/scala-2.10.4

upgrade to Scala 2.10.4
Merge branch 'master' into scala-2.11

Conflicts:
	build.sbt
	sbt