Override default merge method for our configuration

For config values of type Array, we don't check for UNSET_VALUE
but only if the array is empty or not

Fix #146
fix rubocop issues
improve rubocop style and add tests
Merge pull request #150 from ggiamarchi/issu146

Override default merge method for our configuration