Remove the installation from pip to fix tests
Merge branch 'master' of https://github.com/affinitic/garethr-diamond