Merge pull request #4 from jarviscolin/master

effects.py all don
Merge pull request #5 from jarviscolin/master

Finishing touches on effects.py
Hybrid Complete
Fixing Branch
Add hybrid stuff
Fixing Branch
fixing
Deleting .orig
update path names in utils