upgraded scala to 2.11.1 and fixed deprecations