Standardise the circle.yml we use.
Merge pull request #8 from csmith/master

Standardise the circle.yml we use.