Fix wrong variable name
Slightly more robust weights handling
Bug in main -- cfg.reset can't be seen from scope
Initial clustering tests (almost working)
Ignore cruft from py.test