The diff issue in masters should be solved.
I have been working in my branch without bothering about master :-[. In github, the default branch was set to tor-launcher-clone, and I cloned from there after installing Qubes..
Switched the branch to master in github, cloned again, fetched Whonix (there was a big diff), merged and pushed.
Could you recheck?