Fix file handle/line ending issues so that tests pass on Windows
Merge pull request #1057 from melissalinkert/windows-tests

Fix file handle/line ending issues so that tests pass on Windows