Merge "Minor makefile cleanups, added support for json linting."