Merge pull request #7 from couchbaselabs/master

A few necessary updates
wait for nodes (ʘᗩʘ')
Merge branch 'develop'