Use emacs itself as the editor if the shell was ran by it

Conflicts:
	config_overrides/zshrc
Merge pull request #1 from r-darwish/emacs-editor

Use emacs itself as the editor if the shell was ran by it
Merge remote-tracking branch 'refs/remotes/upstream/master'

Conflicts:
	config_overrides/zshrc