Fixed shk-names: Shopkeeper names have spaces in them

Original version produced an annotation for "peaceful a"
some beautification
Merge pull request #10 from ohle/upstream

some fixes in shk-names and annotations-monsters