polling of comments, queue, and video working locally
adchange polling time and hid twilio keys with env var
change polling to occur every 5500ms
live comments now working, changed views to reflect changes
fixing user name
fixing merge conflicts with upstream in notification controller
Merge pull request #29 from woodchucks-2014/pre_rollback

Pre rollback