Added Windows instructions for setup tools

Also fixed spelling error
fixed merge