Clean up ordering of setup.py requirements.