Update Gradle wrapper to 2.2.1
Use ErrWriter instead of many error checks for each line
Use test.enabled=false in build.gradle instead of overwriting the test task