user/jszakmeister: behave better when expanding ``skel``

Expanding ``skel`` now behaves more like expanding a snippet.  ``skel``
is now kept, and the return value from the ultisnips command is returned
in the event that we fail to find a template.