Change to Scala 2.9.1
Merge remote-tracking branch 'upstream/master'

Conflicts:
	build.sbt
Cross compile