Improve circle.yml

This is only to clean up and make better use of CircleCI.