Switched to zsh Emacs mode
merge
Added *.orig to .gitignore