Ignore .canary files (see Scripts/env_setup.sh)
Removed old, commented out code
re-enabled debugging output
code cleanup (remove old comments, etc)
Merge branch 'master' of github.com:tunapanda/live