Checking 'on' for non absolute URLs was waiting and using contains

Now we use URI manipulation to ensure we are comparing the path part of the url.

Conflicts:
	canopy/canopy.fs