fix main js to use new json keys
Merge branch 'master' of github.com:hariananth/streetstories
Merge branch 'master' of github.com:hariananth/streetstories
Merge branch 'master' of github.com:hariananth/streetstories
Merge branch 'master' of github.com:hariananth/streetstories
cleaning up