Sounds like all will be good then. I travelled through the Middle East last year during the Arab spring and felt pretty safe, but my friend isn't as opened minded yet. And wearing Arab dress saved me a lot of hassle in some souks.
So any recommendations where to stay in Marrakech, I'm looking at the Sofitel Imperial Palace, but am open to suggestions (from backpackers to 5-star)