Added pull request and using correct location of p4merge
Modifying CDPATH