Properly name scripts
Add p4merge wrapper
Use p4merge as default git difftool