rm *~
make Setup.hs executable
git ignore /dist/.
Merge remote-tracking branch 'upstream/master'