Merge branch 'development'
Slight cleanup
Update JSON Version
Merge pull request #4 from SteveyPugs/master

Getting Development Back in Gear