Upgrade to plugin 0.4.2 and Gradle 2.1