add opendiff as mergetool, add git serve alias, add editor
Merge branch 'master' into propertybase

Conflicts:
	zshrc