fixes for compiling under groovy 2.2+
Merge branch 'master' of github.com:ssadedin/groovy-ngs-utils