Re-jigger circle.yml and remove sudo-hacks