cleaning up a bit and preparing to ditch Tempo client in the hopes this will fix the network-eventually-fails problem
Merge branch 'master' of github.com:AKAMEDIASYSTEM/bbb-tempo-graden