Break out everything into modules
Fix accidental code dupe
Fix a couple import issues
Remove a bit of silly logging
Depend on a fixed zoetropic
Merge pull request #2 from kennknowles/modularize

Modularize