Merge pull request #2178 from cpennington/ddt-without-six

Use a version of ddt that supports unicode w/o requiring six at runtime

requirements/edx/base.txt

@@ -93,6 +93,7 @@ transifex-client==0.9.1
 
 # Used for testing
 coverage==3.7
+ddt==0.6.0
 factory_boy==2.2.1
 mock==1.0.1
 nosexcover==1.0.7

requirements/edx/github.txt

@@ -22,6 +22,3 @@
 -e git+https://github.com/edx/django-waffle.git@823a102e48#egg=django-waffle
 -e git+https://github.com/edx/event-tracking.git@f0211d702d#egg=event-tracking
 -e git+https://github.com/edx/bok-choy.git@bc6f1adbe439618162079f1004b2b3db3b6f8916#egg=bok_choy
-
-# Move back to upstream release once https://github.com/txels/ddt/pull/13 is merged
--e git+https://github.com/edx/ddt.git@afef6647edb488afc471b0239ef8c4b0669e5fdf#egg=ddt