initial try
More changes
More fixes
More fixes
more fixes
more fixes
Hopefully everything works now
Merge commit '64c8d84ba25ee077cf1eaff4b09bfa251147e79d' into jhc-expiry-merge-1.3.1
Merge branch 'jhc-expiry-merge-1.3.1' into bs-merge-expiration-change
Remove trailing whitespace and cleaned up logging
Remove trailing whitespace
Now delete any expired file, regardless of other reasons for merge
Adressed review comments
Merge pull request #87 from basho/bs-merge-expiration-change

Change behavior of merge when merging for data expiration