emacs or vim?

:)
Merge pull request #1 from greyia/emacs

emacs or vim?