merge
Merge branch 'master' of https://github.com/CondeNast/pangea
noticed weirdness with link underlines, fixin it