Remove git submodule
Readd json as proper folder not a git submodule
Merge remote-tracking branch 'upstream/master'
Merge pull request #4 from tgandrews/master

Clean up submodule craziness