fix merge conflicts (?)
fix merge conflicts (???)
Merge pull request #35 from jomo/shairport-patch

Make mpd play nicely with shairport
Merge remote-tracking branch 'upstream/master'