simplified build.sbt, added Typesafe Config, Slick and ScalaTest
Merge remote-tracking branch 'origin/master'

Conflicts:
	build.sbt