Upgrade to build 0.13 and gradle 2.1