Revert "Revert "Merge pull request #94 from guardian/pw-play-2.1-no-sbt-io-no-salat""

This reverts commit b85e68a76a234a55f98d68e15a32f32db68c9ea2.