Updated templates

  * added two templates: org-general{,-s}, them help to create new Org
    documents, one with '-s' suffix will strip all 'optional' lines.

Signed-off-by: Vladimir Lomov <lomov.vl@gmail.com>