Upgrade to gradle 1.6

Adjust the wrapper and add a wrapper task to make future upgrades easier