Updated README.md to better match the wiki, and fixed links for new location.