fix conflict resolution fail
replace 'cleanupbuild' easyconfig parameter by '--cleanup-builddir' command line option, and enhance unit tests
Merge pull request #12 from boegel/cleanupbuild

replace 'cleanupbuild' easyconfig parameter by '--cleanup-builddir' command line option, and enhance unit tests