Upgrade to play 2.2.1, fix tests et al