Got tests working on windows, upgraded to latest scala, replaced junit with scalatest

I find that whenever you are splitting text into lines, the way that
works on linux, windows, and osx, is s.split("""\r\n|\r|\n""")