Clean up history file. Update it to reflect merge of #1027