Added p4merge wrappers
Added build-vm-02 to the sshconfig