Merge branch 'add-ensure-param-to-mpd-server'

Conflicts:
	manifests/server.pp
Merge branch 'master' of git://github.com/ajjahn/puppet-mpd