Merge pull request #7 from nickmalleson/master

Finished json2csv