Fix lots of wierd code
Merge branch 'master' of github.com:forbesmyester/eventsource-monitor