ensure that we're resolving links properly, like [[ThisThing|blah]]
#20 remove need for save-match-data and fix the match for ftp