Upgrading to Scala 2.11

Do not merge until Scala 2.11 PR for Tortoise has been merged.

Review/merge by me!