P4Merge 2014.2

Updated P4Merge to 2014.2

Also added a [link to my own site](http://pempek.net/articles/2014/04/18/git-p4merge/) where people can find instructions and a wrapper script meant to better integrate `p4merge` and `git`. Feel free to remove it from the formula if you find it's not appropriate.