Whitespace changes to make it pep8 compliant
Keep track of substitution events.
Merge pull request #6 from dget/whitespace-pep8-changes

Whitespace changes to make it pep8 compliant
Merge pull request #5 from dget/subs-events

Keep track of substitution events.
merging in new subs parsing