ignore couchdb
de-ignore

Merge branch '2.0.x'

Conflicts:
	.gitignore