Updated to Groovy 2.1.2
Changed to @Mixin instead of using inheritance