Bumped SBT to 0.13.6; disabled name hashing.
Remove type annotation no longer necessary in Scala 2.11. Fixes #126.
Merge branch 'master' into scala-2.10.x
Revert "Remove type annotation no longer necessary in Scala 2.11. Fixes #126."

This reverts commit d011476928adb24605845717322327b592b0fb1f.