Merge pull request #1 from NodePrime/feature/testing

Feature/testing
Merge pull request #2 from NodePrime/feature/fixing

Feature/fixing
Merge pull request #3 from NodePrime/feature/unannounce

Added the unannounce
Merge branch 'develop' into feature/testing
Beginning improvements to sd-etcd
Working on the new setup
Post etceterad fixes and test rewrites