Merge pull request #85 from csmith/master

Annoying Circle CI changes.
Fix pulling pull requests.