Use saner smerge command prefix
Don't use easy-kill

Turns out it is not that good without transient mark mode
Add upstart.el for upstart mode
Use shell-script-mode for zsh files