fixing story mapper
story updates
Merge branch 'dev'
more typo/node link error fixes and some mapper tweaks
Merge branch 'dev'

Conflicts:
	testdata/story/story.txt
	utils/storymapper/storymapper.pm
fixing merge conflicts