Adding Eigen and jsoncpp to repo; many refinements to makefiles