More circle.yml tweaks