a little refactoring on the way to making a pluggable architecture.

jordan-wright: I am in the process of refactoring to get to a point of a pluggable system for data collection. One thing to note with this pull req is the use of deque to determine what has been processed. Feel free to pull this, as I will be working on this roject over the next couple of days, but if you are not interested, no feelings will be hurt. Thanks for the inspiration and you contribution to the infosec world with this project.