Getting this fork up to date with all accumulated patches

so that we can point our `Gemfile` entries back at the fork owned by the modcloth org and *just maybe* attempt to submit the changes upstream.