removing double-loading of json
merging master and adding terminator gem