Update to new format of pattern data in the newcbvs branch of django-pstch-helpers

Signficiant simplicification and cleanup of code
Added a couple of comments