tests now pass on windows
Merge pull request #111 from erikvold/windows

Tests now pass on windows r=@jsantell