XBlock Discussion changes
Merge pull request #122 from aboudreault/rebase-discussion-changes

XBlock Discussion changes