update gitignore and add cabal config for haskell
Merge remote-tracking branch 'origin/master'