[FEATURE] support merge and file ext options
[FEATURE] support configurable file extension
[FIX] multiline block parse
[FIX] spurious whitespace when saving unchanged blocks
[FEATURE] from @gertz f8974225
[FEATURE] merge behavior tests
[REMOVE] @extension 0a41360f7 from this branch (see 629a5cc3)
[FEATURE] support merge and file ext options
[FEATURE] from @gertz f8974225
[FEATURE] merge behavior tests
[REMOVE] @extension 0a41360f7 from this branch (see 629a5cc3)
[FEATURE] add recrypt support
[FEATURE] add recrypt support
[FIX] remove debug
Merge branch 'features/feature-merge-behavior'
[FEATURE] from @gertz f8974225
[FEATURE] merge behavior tests
Merge branch 'features/feature-extension'
Merge branch 'features/feature-merge-behavior-clean'
Merge branch 'master' of github.com:rooprob/hiera-eyaml

Conflicts:
	lib/hiera/backend/eyaml_backend.rb