Minor bug fixes + updated to gradle plugin 1.0.