Merge pull request #1 from tostercx/master

Makefile consolidation
Switch dependency repository back, and use a named branch now for compatibility.
Drop 7zip installation step, should already be installed on AppVeyor by default.
sync forks
improved testing