Merge pull request #1 from frankrousseau/master

Improve code style
minor debugs
debug replication file
debugs and merge conflict
Merge branch 'master' of github.com:poupotte/couchdb-fuse

Conflicts:
	cozy_files.py