debug cleanup
more debug cleanup
Merge branch 'master' of github.com:sbirch/webtalk