If foo: does not exist but foo does, load that instead.

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
Tool to create contrib/ patch.

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>