Merge pull request #173 from takluyver/update-tooling