Fix broken import in collector.py.
Let loadPlugins() support any sequence type, not just list.
Add unit test for collector module.  Hide six egg from git.
Merge pull request #70 from Metaswitch/master

Fix bugs in setup.py collector