Reintegrate functional tests into etcd.
Merge pull request #243 from benbjohnson/reintegrate-functional-tests

Reintegrate functional tests into etcd.