Added putty
Fixed diffmerge path