Version 0.9.1
Scala 2.11 final
Merge branch 'master' into scala-2.11

Conflicts:
	project/project.scala
Merge