Added support for 2.10 and did some cleaning
Merge branch 'master' into pw-scala-2.10

Conflicts:
	build.sbt
Merge pull request #11 from guardian/pw-scala-2.10

Added support for Scala 2.10