Travis fix.
Merge branch '0.2' of https://github.com/coreos/etcd into 0.2
Merge pull request #245 from benbjohnson/0.2

Travis Fix