Version update
Rearranged files, and tidied serializers
Added toString on AST
Added toStrings to parsers
Merge branch 'master' into scala-2.11

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