Conflict basics done

- Add actual tracking and forking of remote DBs
- Updated tests to use tracking of remote DBs in the right order and do
  proper initialization that way
- File conflicts are detected and stored in tmp/ (with hashes in names)
- File updates have been fixed to avoid accidentally tracking conflict
  file
- File deletes have been fixed to work better in conflicts
- Some test cases plans have been recorrected due to being badly planned
- More conflict tests have been added
- Found race conditions when deleting files right after a sync when the
  file tracker didn't get to detect it, leading to missed updates. No
  way to fix it.