DO NOT MERGE Issue/multi scala support

Test to see if my changes build fine on jenkins with Scala 2.11