Merge pull request #909 from cpennington/xmodule-mixin

Pull XModule attributes out into a mixin that can be applied to xblocks
Switch get_html replacement out for using wrap_child