Done making things windows-friendly.

The tests now compile and pass on windows and mac.
I have not yet tested the current build in linux.