Merge branch 'sox' into 2.1sox

Conflicts:
.gitignore
Makefile
README.md
audio_alsa.c
audio_dummy.c
audio_pipe.c
common.c
common.h
configure
daemon.c
mdns_external.c
player.c
player.h
rtp.c
rtp.h
rtsp.c
scripts/debian/default/shairport
scripts/debian/init.d/shairport
scripts/systemd/shairport.service
shairport.c