Merge pull request #13 from jdutil/master

Fixes engine.rb to call activate for decorators, formatting cleanup.