Merge remote-tracking branch 'kali/bug/fix-couch-dep' into develop
Actually save the doc in couch
Keep file watcher in memory to prevent losing file events
Merge remote-tracking branch 'chiiph/bug/save_doc' into develop
Merge remote-tracking branch 'chiiph/bug/keep_watcher_in_memory' into develop
Properly parse mail address
Merge remote-tracking branch 'chiiph/bug/properly_parse_addr' into develop
Fold in changes.
Merge branch 'release-0.3.2'