Fix for push.default incompat between git versions.

- Use `upstream` by default.
- Include .gitconfig_local to override with `simple` (where both
  `simple` and [include] are available).
Merge branch 'master' of github.com:ndreynolds/dotfiles