Add test ini with appropriate test etcd server to hit.
Update sample as discovery isn't a separate section yet.
Merge branch 'dev' into feature/run-travis-tests
Actually run the tests on travis.
Update IP for test cluster.