Various changes; org now from package.el
Update to latest version of geiser