fix git diffs :-D
Sweet, I can ipv6 ssh to maya now
Merge remote-tracking branch 'origin/master'

Conflicts:
	ssh/config