Get rid of the bulk of the offenders
Merge branch 'master' into sh-remove-old-preview
Merge branch 'master' into sh-remove-old-preview

Conflicts:
	riff-raff/app/controllers/Testing.scala
	riff-raff/app/controllers/deployment.scala
	riff-raff/app/deployment/model.scala
	riff-raff/app/persistence/representation.scala
	riff-raff/test/Utilities.scala
Update test for new DB schema
Merge pull request #171 from guardian/sh-remove-old-preview

Remove the old preview code