Zsh: do not correct rspec and bundle commands.
Git: diff3 conflict style, new aliases.