Added setup instructions for Windows

Plus some minor changes in the OSX/Linux setup instructions to reconcile the
two