Fix Slick 2.0 issues
Merge pull request #1 from cvogt/master

Fix Slick 2.0 issues