Added .zshrc and added a new git alias for merging with the --no-ff flag