added grunt build to create better .json, and a few cleanups