Add .idea/ (IntelliJ IDEA) to .gitignore
Kill Git merge options
Support 'make -w' in Haskell errorformat
Add Kitten syntax highlighting