Adding configuration to use p4merge as the default mergetool on Mac.

Instructions found at http://www.andymcintosh.com/?p=33