Updating the fixture with the latest data
 - pulled from db_populate-d database
Merge branch 'master' into redfive-problemset-tests
Initial commit of the test stuff I did yesterday

	modified:   courses/exams/views.py
	new file:   templates/exams/test_xml.html
	modified:   urls.py
Merge branch 'master' of https://github.com/Stanford-Online/class2go into wescott-master-c2g-exercises
Make ready for @jbau to look at

	modified:   templates/exams/test_xml.html
Turn on the nose testrunner for tests.
Moving the problemsets tests into a module.
Some cleanup of existing tests and adding 2 new tests.
Adding an init file; enables module tests
- needed the __init__.py file to get the tests loading
Update of the testdata
merged origin/master back in
Breaking out the advanced and base tests
- separated test_base out in prep for moving to a more central location
- separated the "advanced" tests out that are going to do modication of
  data. Might move to doing view/model etc
Merge branch 'redfive-nose-tests' into redfive-problemset-tests
Merge branch 'master' of https://github.com/Stanford-Online/class2go into wescott-master-c2g-exercises

Conflicts:
	main/courses/exams/views.py
Merge branch 'wescott-master-c2g-exercises' of https://github.com/Stanford-Online/class2go into wescott-master-c2g-exercises

Conflicts:
	main/courses/exams/views.py
Make problemset XML root, create problem divs from children

	modified:   templates/exams/test_xml.html
Jason step 1 database
Merge branch 'wescott-master-c2g-exercises' of https://github.com/Stanford-Online/class2go into wescott-master-c2g-exercises
Some bugfixes

* Added better enumeration for short answer types--it was not enumerating previously
* Changed class from "problem" to "question"
Further nose-ification; attempt to create a problemset
- extend the django_nose class to only load fixtures once
- commented out test for problemset creation
- commented out init lines, don't think they're needed with nose