Make bash replace itself with zsh when run as login shell

Works around a server where I can't chsh :P
Revert "Make git 1.8 happy; pick the 'simple' merge option."

This reverts commit d987159faba2439e73aa915daf8efe34a837b835.

To make git 1.7 happy, since it has NO forward-compatibility.