Switch to scalac 2.11.2.

This also required updating a couple third-party packages, which
required updating our code to their new API (minor).

And the new compiler has already found two bugs, also fixed here.
Merge branch 'ready/scalac-2.11' into wip/268-code-coverage

Conflicts:
	.travis.yml