Grammar police! ;p
Merge remote-tracking branch 'upstream/master'
A few fixes... (WIP)

Delete empty collections on delete
Avoid the broken pipe on shutdown issue with KUAl's IO redirection
WIP work on making incremental updates work properly when importing from
Calibre
There, progress!
Some cleanups... (WIP)
More cleanups (WIP)
Okay, that should do it...
Get rid of the uglyness of dropping duplicates
That looks okay
We actually don't need that copy, yay
150ms usually does the trick
Merge remote-tracking branch 'upstream/master'

Conflicts:
	librariansync/generate_collections.py
	librariansync/kindle_logging.py
Fix merge conflicts
Minor nitpicks
Missed that in the merge
Merge pull request #2 from NiLuJe/master

Some minor tweaks & calibre import improvements