Canary merge

Lots of new functionality enabling two-way system, compatible with new lamassu-server features.