   (local-set-key (kbd "C-c C-a") 'pjones:haskell-new-import)
   (local-set-key (kbd "C-c C-s") 'pjones:haskell-sort-imports)
   (local-set-key (kbd "C-c C-v") 'pjones:haskell-lint-all)
+  (local-set-key (kbd "C-c M-m") 'pjones:haskell-new-module)
   (local-set-key (kbd "M-RET")   'pjones:haskell-smart-newline)
 
   (make-local-variable 'tab-always-indent)
   (setq tab-always-indent t
-        haskell-indentation-layout-offset 2
+        haskell-indentation-layout-offset 0
         haskell-indentation-starter-offset 2
         haskell-indentation-left-offset 2
         haskell-indentation-ifte-offset 2

             (newline)
             (insert text))))))

(defun pjones:haskell-mode-hook ()
  "Hook run on new Haskell buffers."
  (pjones:prog-mode-hook)

;;; TO-DO List:
;;
;; * Add support for camelcase to keys like C-w
;; * Figure out a better way to do completions.
;; * Need a better key for completions.
;; * Remove whitespace at end of line while typing?
