Merge in 'ps3mediaserver' and associated headless config instead of 'mediatomb'