Fix rake file, remove the previous rake task
Update to use Ubuntu for masters as Centos pool gets drained often