Fix gemspec to include missing templates
Merge remote-tracking branch 'origin/master'
Update gemspec for merge c02bc32