mark_safe for str and unicode

We need to check for both class types, when choosing whether to escape.