Removed user from EditVendorSerializer

I think there is a bug in our code that can particularly map vendors to
the wrong user objects on edit. I sure hope this hasn’t happened in
production…
Fixed market card hours

Turns out I had originally written this so that it picked the first set
of hours to display each time rather than the ones for the given day.
Merge branch 'master' into protractor-tests