Updates to Makefiles, targets changed slightly. Update to README.md