Update gradle to 2.1 and some minor build script things.