Fixed reindex_wcs, added test for it, PEP8 fixes to util.util while I'm at it...