Gradle 2.0

Nothing too fancy, just trivial fixes.