update to scala 2.11
Merge remote-tracking branch 'origin/master'