Configure git to ignore editor save files.
Rename decorators/wrappers and no longer pass the class of bound function to user wrapper.