Most of the work on story arcs

Still need to handle archives
fidding with spaces
Merge branch 'master' into feature/story_arcs
small header fix
Merge pull request #3 from Brant/master

brining branch up to speed
Merge pull request #4 from Brant/master

Reverting
fixing conflict
Story Arcs!
Merge pull request #6 from Brant/feature/story_arcs

Feature/story arcs