Commit Windows

*minimum changes that windows think are different from master