update to 0.4.2
Add changelog for 220 and update lock
Fix syntax errors
Use node[:ipaddress] if `addr` or `peer_addr` is omitted
add comment on statedir attrib
remote local key, not needed anymore
remove unused spec
update changelog with the removal of local
 fixup the README with :local removal
bump to 220
Merge remote-tracking branch 'upstream/master'

Conflicts:
	libraries/etcd.rb