various and sundry changes from primary repo

- some Do Not Track stuff
- Sparkdown macro stuff
- UPS stuff

And more!

Ok really we've got to figure out a better mode for publishing this stuff.