Port to Scala 2.11.

This is based on the _2.10-1.6 tag.  It should be pulled in as its own branch, and can be released as _2.11-1.6.