Upgrade to Java7 and remove redundancy from gradle scripts.
Merge pull request #182 from tbak/2.x

Upgrade to Java7 and remove redundancy from gradle scripts.