Move conflict.js to lib/
Don't add conflicts for dirs, update conflict API
Add lib/constants.js, teach rsync about makedrive-unsynced in patch step
Fix bug in rsync sourceList refactor