Fork less, round 2

Scala 2.11 patches to Play and json4s were merged upstream. We can migrate off my forks now.