Smoothed out the unicode handling a little bit
Merge branch 'SparklePigBang-application_finder' into application_finder