Point watch file back to github
Rebase automake-1.14 patch to upstream version 2.3