Merge pull request #78 from matysek/develop

Fix some tests for version 2.1.
Fix: Prevent zipped eggs potentially being skipped for extraction.
Merge pull request #79 from agrue/fix_egg_extract

Fix: Prevent zipped eggs potentially being skipped for extraction.
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	PyInstaller/bindepend.py