Adopt announcements to use DI
Remove proxyquire
Adoptions to let tests run (well, still not all of them)
Merge branch 'master' into cleanup
Make tests running
Merge pull request #187 from triplem/cleanup

Adopt announcements to use DI