Plugin to add annotations with data from mon1-343.txt for farlook
shorter monster annotations
fix regex for "holding you", etc. in annotations-monsters
More robust regex for annotations-monsters
Fixed shk-names: Shopkeeper names have spaces in them

Original version produced an annotation for "peaceful a"
some beautification
colors for annotations-monsters
fixed attack colors
Merge branch 'upstream'

Conflicts:
	plugins/annotations-monsters.pl
Starting intrinsics fix for ran/rog in joc-notes