Include gitconfig.local file for personal changes

* assumes same directory existance
* allows for easier addition of personal configs
Don't require 'ff' for git-merge
Merge branch 'upstream'

Conflicts:
	gitconfig