Merge pull request #369 from dorkster/effects_refactor

Update effect definitions and post_effects