Only load each json file once. Switch to custom hash-merging implementation.
Quick hack of testing process
Track files that were modified
Merge test and reporting of files modified.

Conflicts:
	lib/s3crets_merge.rb
Delete output after running test
Merge pull request #1 from sciurus/master

Merge basic testing and reporting of files modified