Support for no-op additions using options
Included Try extractor
Bugfix for `+` method
Added StringContext parse macro
Merge branch 'master' into scala-2.11

Conflicts:
	project/project.scala
	src/data.scala
Removed some deprecation warnings