Update for Slick 2.0.0-M3

Review by @cvogt