scala 2.10 version

scaltra 2.0.5

run using sbt 13 not the local nonsense
moves on to next dev version number
Merge pull request #11 from guardian/scala-2.10-scalatra-2.2.1

Scala 2.10 scalatra 2.2.1
Merge branch 'master' of github.com:guardian/scalatra-openid-consumer into sc-base64-cookie

Conflicts:
	build.sbt