Ameobea Update code to compile with latest library versions

Latest commit 592a195

Aug 3, 2018