a la cache
add fommil to the contributor list
Merge pull request #260 from fommil/cache_carte

a la cache
Logumes on the side
Merge pull request #261 from fommil/case_logging

Logumes on the side
Bumped Scala version to 2.11.4.
Merge branch 'master' into scala-2.10.x

Conflicts:
	.travis.yml
	project/Build.scala
Backport to Scala 2.10.x.
Bumped SBT version to 0.13.7-RC2; simplified plugin additions.
Merge branch 'master' into scala-2.10.x