Merge pull request #223 from storybookjs/shilman/extend-keywords

Merge pull request #223 from storybookjs/shilman/extend-keywords #31