Allow custom HTML in menu_block.

This will allow custom HTML to be interspersed between add_item
calls in the menu_block helper.
Merge pull request #91 from biola/menu_block_html

Allow custom HTML in menu_block.
Merge branch 'master' into making_bio_its_own_controller

Conflicts:
	app/views/people/_menu.html.slim