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

Conflicts:
	lib/s3crets_merge.rb
Delete output after running test