Improve haskell make template
Clean up and add gimp hooks
Merge branch 'master' into apricot
Disable backup
Add highlighting for TODOs and FIXMEs
Merge branch 'master' into apricot