Finish moving the deploy rake tasks to use the new class/modules