some further minor cleanup of set.rb
Clean the empty modules from the load list
Merged ethan's set_events and the module cleanup
Merge remote branch 'ethan/develop' into develop
Merge develop