Update to pick up a number of issues - more to do
Merge remote-tracking branch 'upstream/develop'
Document pull request 50, argv_emulation for OSX
Delete obsolete message about NT and Win2K.
Make option help texts consistent with new doc.
Make usage help strings consistent with 2.1 doc
fix typos in usage text
Fix a few typos
Remove "python" from usage string
Text complete for 2.1 pending final review
Merge branch 'master' of https://github.com/tallforasmurf/pyinstaller into develop
Fix: PyInstaller was failing when None library was found as ctypes dependency.
Issue #617: Create matplotlib config folder in temp directory everytime the app runs.
Issue #617: Ignore matplotlib test if matplotlib package missing.
Merge remote-tracking branch 'origin/develop' into develop
Merge pull request #57 from matysek/develop

Pick up the 2.1 doc