add xmpfilter
Remove trailing whitespace automatically
Add xmpfilter back in
Add readme note for xmpfilter
Merge remote-tracking branch 'upstream/master'