Homogenised uri helper

Signed-off-by: Tom Wright <tom@inflatablecookie.com>
Simplified html image urls

Signed-off-by: Tom Wright <tom@inflatablecookie.com>
Updated link uri handling

Signed-off-by: Tom Wright <tom@inflatablecookie.com>
Updated uri output handling

Signed-off-by: Tom Wright <tom@inflatablecookie.com>