Lots of upstream changes for your perusal

This is the version we're using at ModCloth, and I'd love it if we could get back to using your (@roidrage's) version.  Thanks for considering!