Merge hidden_span_if and hidden_div_if

Can now use hidden_tag_if for good and evil
Merge pull request #748 from kbrock/hidden_div_if

Merge hidden_span_if and hidden_div_if