Revert "revert scala to 2.10.4"

This reverts commit 95e2f35e3115ea13be7c656000409ba0c5392083.