Simplify build.sbt a bit
Update travis config
Merge branch 'master' into scalacheck-js

Conflicts:
	build.sbt