cleanup, inputs, swapping out proxima in various places
Merge branch 'master' of git://github.com/CondeNast/pangea