Replaced a few calls to stringr with stringi (which has to stay for unicode encoding function). Not likely that people won't have stringr, but makes the dependencies a little better.