Merges #201 with current master, adds support for development on Windows

[koshell]

trafficstars

Updated #201 to allow for easy merging. While I was there I also fixed up the tests to allow them to run on windows.

All current tests pass.

I'm happy to fix up any other issues blocking this from merging.