modding the schema should also set collection modified

required for the force full sync case
fix modification check in note merge
include full traceback on sync error
remove dropbox image escape hack
Merge remote-tracking branch 'dae/master' into flake

Conflicts:
	anki/media.py