Migrate to Slick 2
Merge branch 'master' into slick2-migration