Add mpd config
Merge branch 'master' into carbon