Updated version to 1.0
Updated imports for 1.1
Merge branch 'master' into scala-2.11

Conflicts:
	project/project.scala