Changes to make Avida compile under Windows
Revert "Changes to make Avida compile under Windows"

This reverts commit 9ec0fe231bcb6ac89f471b515542c4885107b05c.
Merge branch 'master' of git://programerror.com/apto