Merge pull request #1 from marshall62/master

Update from original
Merge remote-tracking branch 'upstream/master'
Added code for units in data driven problem author
Merge branch 'master' of https://github.com/marshall62/mathspring
Added code for units in data driven problem author
Merge pull request #163 from mfrechet/master

Units field added with subrepo contents included