[KITCHEN-77] Allow custom paths

The merge code was using nil when attempting to override data_bags and roles path with custom paths. This will look at those values first and attempt to find and use them.