Move cleaning to .configure(), add merge_json_file
test fixes
Merge pull request #2 from percolate/move_clean

Move clean