      (define-key haskell-mode-map (kbd "c-c c-t") 'haskell-process-do-type)
      (define-key haskell-mode-map (kbd "c-c c-i") 'haskell-process-do-info)
      (define-key haskell-mode-map (kbd "c-c m-.") nil)
-     (define-key haskell-mode-map (kbd "c-c c-d") nil)))
+     (define-key haskell-mode-map (kbd "<return>") 'newline)
+    (define-key haskell-mode-map (kbd "c-c c-d") nil)))
 (eval-after-load 'auto-complete
   '(add-to-list 'ac-modes 'inf-ruby-mode))
 (if (fboundp 'scroll-bar-mode) (scroll-bar-mode -1))

     (define-key paredit-mode-map (kbd "c-(") 'paredit-backward-slurp-sexp)))
(eval-after-load 'inf-ruby '
  '(define-key inf-ruby-mode-map (kbd "tab") 'auto-complete))
(eval-after-load "haskell-mode"
  '(progn
     (define-key haskell-mode-map (kbd "c-x c-d") nil)

(require 'popup)
(require 'php-extras)
(require 'auto-complete-config)
(defun yas/popup-isearch-prompt (prompt choices &optional display-fn)
  (when (featurep 'popup)
    (popup-menu*
