Fix some common html validation oddities as part of the build process
Fix some unencoded ampersands in urls