Removed cl-lib dependency, and with it, support for emacs 23
Made haskell code indent with haskell-indent-mode, which seems least broken to me