Updating travis to 2.11.4, updating @phaller's email
Merge pull request #236 from scala/update-travisyml

Updating travis to 2.11.4, updating @phaller's email
Merge branch '0.9.x' into merge-0.9.x-into-0.10.x
Merge pull request #237 from scala/merge-0.9.x-into-0.10.x

Merge 0.9.x into 0.10.x