Upgrade to scala 2.11.4

To the extent possible here anyway