update scala to 2.11.1
Merge branch 'master' into scala-2.11
Bump version to 0.1.4
Merge branch 'master' into scala-2.11

Conflicts:
	core/src/main/scala/net/maffoo/jsonquote/literal/package.scala
Merge branch 'master' into scala-2.11
Remove dependency on scala parser combinators
Merge branch 'master' into scala-2.11
Merge branch 'master' into scala-2.11
Merge branch 'master' into scala-2.11

Conflicts:
	project/Build.scala
Merge branch 'scala-2.11' of github.com:maffoo/jsonquote into scala-2.11
Merge branch 'master' into scala-2.11

Conflicts:
	project/Build.scala
Merge branch 'scala-2.11' of https://github.com/maffoo/jsonquote into scala-2.11
Move macro code into scala-2.10 source directories.
Merge branch 'multi-version' into scala-2.11

Conflicts:
	project/Build.scala
Merge branch 'scala-2.11' into multi-version

Conflicts:
	lift/src/main/scala-2.10/net/maffoo/jsonquote/lift/package.scala
	lift/src/main/scala-2.11/net/maffoo/jsonquote/lift/package.scala
	lift/src/main/scala/net/maffoo/jsonquote/lift/package.scala
	project/Build.scala
	spray/src/main/scala-2.10/net/maffoo/jsonquote/spray/package.scala
	spray/src/main/scala-2.11/net/maffoo/jsonquote/spray/package.scala
	spray/src/main/scala/net/maffoo/jsonquote/spray/package.scala
Add scala 2.11 to tragic CI builds.