Update version numbers for 2.1
Remove deprecated features
Merge pull request #673 from slick/tmp/2.1-cleanup

Clean up for 2.1 in master