Removed outdated shops and added some new ones. This was done from memory, so please do not be afraid to move things yourself, for anyone interested. Many have been left as shop=yes and many are still missing as I wasn't sure about the placement. See https://www.openstreetmap.org/changeset/142141688