Add tests for cleanup_fds
Sort the included files

Conflicts:
	supervisor/options.py
Add test and changelog entry for sorting included files.  Closes #225