Round of updates

Nothing more than updates here.

gradle 2.1 is quite nicer to use, the rest doesn't introduce any useful improvements AFAICT.