magit 2.1 customization to prevent COMMIT_EDITMSG in new frame?

[Jeff Kowalczyk]

In Magit 2.1, how do I prevent commit from creating a new frame COMMIT_EDITMSG?

I'm starting fresh with magit customization with the upgrade to 2.1. An excerpt of my 1.x customization:

(defun magit-exit-commit-mode ()
(interactive)
(kill-buffer)
(delete-window))
(eval-after-load "git-commit-mode"
'(define-key git-commit-mode-map (kbd "C-c C-k") 'magit-exit-commit-mode))
;; close popup when commiting
(defadvice git-commit-commit (after delete-window activate)
(delete-window)))