Upgraded to latest plugin tools and gradle