Update for latest ansible, and neaten up a bit