minor clean up of analysis scripts. setup.py handle ziff correctly