merge-sync
Merge branch 'initial-import' of github.com:hyperdns/hapi-client-python3 into initial-import
work got skewed on two machines