Change onActivate and onDeactivate to be methods not properties
Merge pull request #174 from eonarheim/dev-erik

Change onActivate and onDeactivate to be methods not properties