Clean up on makefile
Using json_spirit::read now since we can (finally!); writer disabled temporarily until I get back around to fixing it
Updated TODO