apt_key location has changed #92

This is #92 rebased on top of the latest master.