Added .gitconfig_local include.
Removed ff-only; it messes things up.
Added pf alias for pull --ff-only.
Merge branch 'master' into mac