Removed eval from define events
Merge branch 'master' of github.com:dharc/dsb-ide
Updated to match NID and agent refactor