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