Update for Slick 2.0.0-M3
Merge pull request #23 from slick/tmp/2.0

Update for Slick 2.0.0-M3