Updated p4merge package to 2014.1
Merge pull request #49 from moserware/master

Updated p4merge package to 2014.1