Minor bugfixes, switching back from autotools.
Merge branch 'master' of github.com:drowdemon/Universe

Conflicts:
	Universe/Animalia/animal.cpp
	Universe/globals.cpp