updated story nodes
recovering after merge/rebase
clearing some stuff we'll regenerate anyway
Merge branch 'master' of https://github.com/ocelotn/spacecrab into HEAD

Conflicts:
	testdata/story/node1.node
	testdata/story/node3.node
	testdata/story/node3C2.node
	testdata/story/node4A.node
	testdata/story/node4A1A1A.node
	testdata/story/node4A1A1A2.node
	testdata/story/node4A1A1A2A.node
	testdata/story/node4A1A1A2B.node
	testdata/story/node4A1A1A2C.node
	testdata/story/node4B.node
	utils/storymapper/story.svg
	utils/storymapper/storymapper.pm