distro dep tidy up
Merge pull request #1908 from andytaylor/master

distro dep tidy up
Merge pull request #1909 from jbertram/master

Add Windows support for new bootstrap
A few distro fixes