Update for slick 2.0.0-M2
Update for Slick 2.0.0-M3