Add slimmer analytics headers for all document types

Also took this opportunity to test it properly.

https://www.pivotaltracker.com/s/projects/367813/stories/40435543