Update files in gemspec.
Update history to reflect merge of #1065