...
Merge branch 'master' of github.com:bww/etcd-java

Conflicts:
	src/main/java/com/brianwolter/etcd/Config.java
	src/test/java/com/brianwolter/etcd/test/ValueTest.java
...