Add in library to project, so jonmorehouse/node-etcd can be installed and used directly
Merge branch 'master' into json
Merge master to json