Added in some formatting on data for when we implement JSON
Merge branch 'master' of https://github.com/benasour/PYP