selectively merge only functional changes

Izzy's gist has some functional changes that enable per-site comments
and more replacement options, but they were mixed up with a default
comment set that doen't need to be the master. This should be just the
functional bits without the data.