Update the flow inside the conflicter so it works with 'diff' option
Merge pull request #298 from SBoudrias/conflicter

Fix async flow when diffing a file (Fix #291)
Updated dependencies

Tests are passing and generator-webapp still works.
Version bump
(tests) Allow stubs to return original value + default noop.
Version bump
Create a this.cacheRoot(), like this.sourceRoot() or this.destinationRoot()

+ Unit test added
+ Support XDG specs

Fix #287
Merge branch 'jdespatis-cache-root'
Update Inquirer to 0.2 and update the conflicter to use the expand prompt