Ooops...
Fixing vimeo again
Fixing youtube shortcode
Handle embedding when in HTTPS
Last tweak, I hope: fixes double embed for old style youtube links
Merge branch 'vimeo_bug' into dev