add configration for golang
change algorithm for diff, change path
Merge branch 'master' of github.com:misogi/settings

Conflicts:
	dot.zshenv