Update Inquirer to 0.2 and update the conflicter to use the expand prompt
Merge pull request #308 from SBoudrias/master

Update Inquirer to 0.2 (and change conflicter prompt)