Rewrite wrap finding to be more clear and pythonic
Remove histogramming code, never used
Change calls to Ciabatta
Remove histogramming, not used
Rewrite wrapping to look clearer
Merge branch 'general_amendments'