Changed push default to upstream (compatibility issues with simplee).
Changed push.default to tracking (compatibility).
Enabled ff-only in gitconfig.
Merge branch 'master' into mac