Merged with local changes at dneg
lots of commented out lines, lets use git instead of commenting out stuff
Merge pull request #2 from DoubleNegativeVisualEffects/feature/merge_local_changes

Feature/merge local changes