Fixed incomplete merge
Remove unused fixtures
initial checkin
removed incorrect comment
added django test runner
Lots of changes in tests
Added comment
added fixtures
Version bump to 2.0 alpha