start of reworking the unittests
ignore .pypirc
Merge branch 'master' of github.com:transitorykris/etcd-py
rename namedtuples to be less ambiguous