Continuation of pull request #80, this time against correct branch (develop)

See commentary in original pull request: https://github.com/kbase/narrative/pull/80