Removing the UI Models in favor of a simple dictionary.
Missed a line in a test
Adding back name attribute parsing
Changing my dictionary combination from add operator to splat.
Add comments and doc to the new functionality in the XBlock
Merge pull request #44 from edx/sanchez/refactor-ui-models

Removing the UI Models in favor of a simple dictionary.
Merge branch 'master' into sanchez/TIM-171-Submission-UI

Conflicts:
	apps/openassessment/xblock/ui_models.py