Update some readme stuff. Backport code to work in 1.8.7. Update usage info.