Set push.default simple in gitconfig.

Misc spacing modifications.