Refactor test. Add functionality to forward requests for entries not in etcd.
Update readme
Merge remote-tracking branch 'upstream/master'
update dockerfile