Bump version to 0.1.4
Remove dependency on scala parser combinators, which are deprecated in 2.11
Merge branch 'master' into scala-2.11

Conflicts:
	core/src/main/scala/net/maffoo/jsonquote/literal/package.scala