Version update
Added 1.0.4 changes
Merge branch 'master' into scala-2.11

Conflicts:
	project/project.scala
Lightweight extraction
Removed extraction/serialization
Merge branch 'master' into scala-2.11