Beginning of Major housecleaning
Merge branch 'master' of github.com:zenweasel/python-snippets

Conflicts:
	CATEGORIES
	database/couch/desktop/addattachment.py
	database/couch/desktop/addrecord.py
	database/couch/desktop/createdatabase.py
	database/couch/desktop/deleterecords.py
	database/couch/desktop/fetchrecords.py
	database/couch/desktop/listenchanges.py