Updates to make Avida compile under Windows.
fixing file conflict in test