Extended docs
Merge branch 'master' of github.com:idemacs/idemacs

Conflicts:
        doc/idemacs.org