Fix build on 7.6.1, and remove some conflicting imports
Add cabal-dev to .gitignore
Bump the version number for release