Bump slf4j and logback vsns
Merge branch 'master' into twoten

Conflicts:
	project/Build.scala