Ignore cabal-dev dir
Merge branch 'master' into zaalbar