Added support for decorators and moved faux 'extensions' to decorators instead.
Merge pull request #367 from radar/decorators

Added support for decorators and moved faux 'extensions' to decorators instead