Small NPC fixes

@ninjalulz mind renaming Rock in a Hard Place.xml and Simon the Beggar.xml to upper case? =P