STILL BUGS

We are rolling back costco master, so this is the branch for features
that won't go into that, eVar72 and eVar73.
rerolled, including the date, etc

I don't know what happened with my previous submit. I must have screwed
it up because it didn't take. :(
Bug fixes for Prod deployment

Many fixes. Deployed to production.
Fixed merge conflicts

merging the merchandising evar branch.