Rebase 20140926 merged xblock discussion changes

Merged discussion changes, resolved conflicts, fixed broken tests
Yes, this shouldn't be set to True in common.py, it's disabled by default. I've checked, it's in Alan's original commit so not your fault @e-kolpakov , but worth removing from the rebased commit.