Stop forcing str on something that isn't always a str [MJ-888]
Use force_text since it's a better way to force text
Merge pull request #678 from DirectEmployers/encoding-errors

Stop forcing str on something that isn't always a str [MJ-888]