updated for circle ci
Merge branch 'master' of github.com:stewartmckee/cobweb