update mpd
use vimdiff instead of diff