modified collector.py
modified gitignore
Merge branch 'master' of https://github.com/sneakywombat/flowp
.