cleaned up test data

[linzjax]

Adding single sets of data is not perfect, but it works. Let me know if this fixes all the pep8 stuff, I don't really trust my linter...

[ian-ross]

Here, you should try using the new OrganizationRole model to set up the roles for organization admins. You can see how it works in organization/models.py. Look in particular at the get_policy_instance function and anywhere you see the OrganizationRole class being used. It might take a bit of experimentation, but if you set things up right, it ought to be possible to make users organization administrators just by creating the appropriate OrganizationRole objects. In fact, if you take a look in the latest version of my test-data/test-data-setup.py script, right at the bottom, you'll see the simplest possible way to do it. (I'm going to merge this anyway, since it otherwise is probably fine, and we'll find problems with it quickly enough once we start using it more.)