Did some cleanup

Man, a lot of stuff got weird.  So our paths were hard-coded, and I
switched them to local.  Then my suggestion to self-complete <span> tags
was causing problems, so I swapped that out.  Now I think things are
back to where they were.