correct some merge error that happened from automatic git merging
remove some wxString references I missed
Merge pull request #155 from Bigpet/wxString_exorcism

Wx string exorcism fixups