updated to latest org
changes to make setup compatible with org-version >= 8.0