Add optional body class option
Fixed conflict
Merge branch 'jedrichards-add-body-class'