Patched for Slick 2.1.0-M1 compatibility

Probably shouldn't be merged before 2.1.0 final is released, but it works and tests pass under both 2.1.0-M1 and 2.0.0.