Subtree merge of subnet-per-host branch
Subtree merge of weave-example branch
Backport change from the gist
Trim down for new structure
Add the missing bits