dirtybit refactor + fixing up decorators
restored files that got deleted
Merge pull request #35 from hayes/decorator-rework

dirtybit refactor + fixing up decorators