Fix bug with URI highlighting

Fixes up the bug with URI highlighting which was in part due to vim
syntax priority rules.  The later operator rules were overriding the
earlier URI rule resulting in the surrounding < > being highlighted and
the actual URI matching whatever other rules happened to be present