upgrade Scala to 2.11.4
Codacy fixes