Author roughed in, minor class changes
Merge branch 'master' of https://github.com/CondeNast/pangea

Merging class changes
Merged all