As it turns out, even though this tool said I had no pad lock due to the twitter links, that was NOT true. I had no pad lock due to a mailchimp form was in the footer and submitting to http (same as your demo theme).
I revered the shortcodes.php file to the provided default, no overrides are required.