WIP: Upgrade to slick 2.1.0