Merge pull request #186 from storybookjs/restore-template-component

Merge pull request #186 from storybookjs/restore-template-component #172