Upgrade to slick 2.1.0
Fixed unit tests
Merge pull request #877 from lossyrob/upgrade-slick

WIP: Upgrade to slick 2.1.0