Update to add vimeo support and simplify template syntax