Moved things around in my local sandbox, after upgrading some elpa packages and fixing load-path issues.