Begin video map shortcode
Merge branch 'master' of https://github.com/michael-cannon/wordpress-theme-helpers
Newline fixes