Update to r69

This is really out of date, so let's bring it to r69 with a nice Makefile to retrieve updates.

Thanks for the note from @stephenmathieson and @jwerle. Would you guys like merge access so that you could hit the green button when it's good?