Use JSON-based config
I did stuff :)
Merge pull request #99 from connor4312/json-config

Use JSON-based config
Merge remote-tracking branch 'upstream/master' into patch-bust-efficient
I did stuff too