Added remux to split new windows in existing devmux sessions
Fixed p4merge location