.travis.yml: diff against real upstream master instead of what travis is telling us.