Trap (NEC codes.
Fix story-level discard.
More on discards.
Merge pull request #54 from johnb30/updates

Updates
Fix relative imports errors.
Merge pull request #56 from johnb30/imports

Fix relative imports errors.