upgrade to Play 2.2.1

only came out yesterday, but I hear the cool kids are using it already
fix a merge oops from f45b515a