Changed the diffs to be based on word boundarys (split on spaces). We also stop using -eregs version
Fixed tests to reflect word boundary changes
PEP8 changes