Fix running supervisord when mock is not installed
Add note that support for Python 2.4 has been dropped
Update manifest
Merge branch 'master' of github.com:Supervisor/supervisor into expansions

Conflicts:
	supervisor/tests/test_options.py