update
	deleted:    .main.py.swp
	deleted:    config.pyc
	deleted:    couchdb_doc_api.py
	deleted:    couchdb_doc_api.pyc
	deleted:    main_bk.py
Merge branch 'master' of https://github.com/anto-daniel/anto-scripts

Conflicts:
	ims-doc-keeper/backup/couchdb_doc_api.pyc