Fix vertical to use correct optional parameters. Fix html block to allow for null context.
Merge pull request #114 from edx/jorr/bugfix/edge-cases-with-vertical-and-html-blocks

Fix couple of edge case bugs in vertical and html.