Using official gmt URL for patch.

The two patches are now merged in a single diff.
Also the issue related to the second patch is now indicated.
Update "conflicts_with" message.