Comments etc
Merge remote-tracking branch 'upstream/master'
Merge pull request #10 from peerster/master

Comments added in couch.cfg