[merge_replace] Add an option to configure default merge behaviour (m…

…erge or replace) (#137)

[merge_replace] Add an option to configure default merge behaviour (merge or replace) (#137)

[changelog] forgot about the release date of the last release

Merge pull request #133 from tycooon/fix-yaml-loading

Fix yaml loading

Merge pull request #130 from umbrellio/json-erb-support

ERB support for JSON files

[gem] bump to 0.24.1

[gem] bump to 0.24.0

[gem] bump to 0.23.0

[gem] bump to 0.22.0

[gem] bump to 0.21.0

[gem] bump to 0.20.0