Merge branch 'hotfix/1.2.1' into develop
Removed spurious utils migration, added __init__.py's back.
First pass at fixing inventory tests.

Completely rebuilt inventory fixtures and created a new meadery
fixture.  Modified add_new_jars.py to work a little better.  Fixed the
inventory tests so that they all run, and they all pass.  Also
disabled the South business when tests are run.
Changed slugs for inventory models, improved tests.

The major change here was to the inventory model's slug definition.
This will be handy when inventory views are written.  The inventory
fixtures were updated to support additional tests.  The management
commands were modified to require proper options.  The inventory tests
were completed, with the exception of one management command which
will likely be converted to an inventory view.
Cleaned up inventory tests, started on meadery tests.

Updated requirements to include south and selenium.  Removed
unnecessary references to client in inventory tests.  Created an auth
JSON fixture (but forgot to indent it...) and updated meadery JSON
fixture to contain ingredients, ingredient items, and recipes.
Started meadery tests including normal client tests and selenium
tests.  Fixed a bug in meadery product template which dealt poorly
with nonexistent images.
Fixed auth fixture and added more meadery tests.

The ingredient form validation code is now tested, at least through
the sugar side.  I'm not sure about testing solvent, flavor, and yeast
-- it's just more of the same.
Removed auth fixture.  Improved ingredients testing.

I updated the ingredients testing to cover deletion as well as addition.
Finished ingredient tests.

Next stop: recipes.
Started recipe tests.  They don't yet work.

They will.  Soon.
Put extra back in meadery admin, finished recipe tests.

Added a comment about how meadery tests check for success, not
accuracy, for the most part.  Cleaned up docstrings.  Removed checks
for specific pk values.  Added test to add recipes, and to modify
recipes, and to create batches from recipes.  Also added placeholder
classes for remaining models.
Fixed batch admin, added batch fixtures, added batch tests, finally made a broken test!

There is one test that now fails when it shouldn't:  test_delete_from_recipe.

The rest pass as they should.
Fixed timeout, cleaned up repetitive tests!

The timeout was too small.  Created a class method to populate objects
with fields and ingredients.  Less reptition of code now!
Updated fixture, added sample tests, updated others.

Fixture now contains samples.  Interestingly, the categories have
changed on some recipes!  Added some tests for samples, and documented
the error generated by test_delete_from_recipe.

Batch tests that are needed -- making recipes and making products.

Product tests that are needed -- all of them.
Added more error checking, added fixtures to sample tests.

Sample tests now run correctly!
Started product tests.  They are broken.

I need to go through the HTML source of the admin page to figure out
what tags are in use.  Once I do that, I can fill out proper fields
and create products.
Fixed problem with batches and recipes.

The test actually caught a design error.  Color me impressed.

The fixtures have crazy crazy key values now.  Not sure if I care.

Also, I totally broke inventory, but I think I can fix it!
Fixed inventory tests, added product tests, fixed bugs!

The inventory tests work again now that I replaced their products.

The create_product_from_batch depends on samples but doesn't check for
them.  Fixed.

Product creation tests work now.

Product deletion tests... not yet.
Fixed product tests.

Added inventory's products back to meadery fixtures.  Imported inventory fixtures for product tests.  Product tests now pass.  Need more tests!
Cleaned fixtures and tests, fixed bug in meadery, added correctness tests!

There was a bug in the meadery method that created products from
batches -- when the same batch was used to create a product more than
once, a server error was returned.  The test caught the bug.  I fixed
the bug.  The test passes without errors.  Victory!

Correctness tests have been added to IngredientTestCase.  The add test
checks that the ingredient did not exist before the test, and that it
did exist after the test.  The modify test checks that the attribute
in question was modified after the test.  The delete test checks that
the ingredient was in fact deleted.  Similar changes will be made to
other tests.  The hard part will be adding correctness tests to less
simple situations.
More progress on meadery tests.

Added a bunch of correctness tests to the meadery tests.  The only
major thing left is changing the recipe test to fail if the recipes
are inadequate.  Time for some test-driven development!