spacing and other scss cleanup
Merge branch 'master' of https://github.com/CondeNast/pangea