This change unifies chihaya and chihaya-e2e binaries. It also vendors the code missing from the project that was used in chihaya-e2e. Fixes #402.