always try to handle org commands, but abort if not in .org file
Merge branch 'master' of https://github.com/wolfgang/org