changes to git conf
Merge branch 'master' of ssh://github.com/mil/home