Text updates, version update, removed `convert` method
Changed version to 1.0.4
Simpler serializers
Updated list of changes
Reformatting some methods
Use JsonExtractor type
Merge branch 'master' into scala-2.11

Conflicts:
	project/project.scala
Lightweight extraction
Implicit changes
Merge branch 'master' into scala-2.11

Conflicts:
	src/package.scala