Merge pull request #102 from csmith/master

CircleCI improvements.
Pull from the right place.