Changes to generalize build off of Mark's system

[bhalonen]

Very simple changes, still depends on file structure...

[markhalonen]

There's code to include junit libraries, which are unit testing libraries. Obviously this code should not go into releases. I've removed it from the mac build, so the Windows build is next on the chopping block. We can do this in another issue/branch