Add skipAll option

Allows you to pass `{ skipAll: true }` so that it will skip all conflicts without prompting.
Added replaceAll option

Turns out that what I thought was a skipAll was in fact a replaceAll, so my option was doing the opposite to what I wanted. I've now fixed skipAll and added a replaceAll option as well.
Update conflict_test.js
Added skipAll test
Fixing test
Merge branch 'breandr-patch-1'
Nicer logging and no logging in tests
Version bump (v.0.2.0)