Adds support for Scala 2.12

Extends the tweaks to the for configuration for 2.11 to 2.12