@pdxmph org-mode and Magit or some of the best parts of Emacs.