Better p4merge config

Signed-off-by: Geoff Lane <geoff@zorched.net>