Rebase 20140926 merged xblock discussion changes

Merged discussion changes, resolved conflicts, fixed broken tests
This code block appears to be a duplicate of the one above?  Copy/paste error?