Add some X-Merge-With-Parent files
Ensure all appdata files have copyright statements

Ryan, feel free to fix up your copyright if I've missed any.