Integrated with coveralls, closes #115
Merge branch 'master' into 2.9

Conflicts:
	project/Build.scala
	project/plugins.sbt