add protocol so we can use https
Fix tests for couchdb 1.6

internals of couchdb have changed considerably so we need a
separate config file for the tests
Merge branch 'master' into int-mushin-3

Conflicts:
	paisley/client.py
Merge remote-tracking branch 'origin/couchdb-1.6.0' into int-mushin-3
remove print; add import
Merge remote-tracking branch 'origin/couchdb-1.6.0' into int-mushin-3