This allows updating code in both places, if necessary. Getting Django
1.5 support would be painful otherwise. This also removes the circular
dependency of django-oscar-testsupport on Oscar.

The requirements were merged. The imports were updated
accordingly. Unused imports in the touched files were removed. No
further changes.

When adding to the basket, products with options were treated as
different products for each combination of options. This allowed adding
more products into the basket than are available for purchase.

The handling has been updated to sum up the already added quantity of
the product regardless of options.

Fixes #665

Fixes #376

This fixes a bug with adding customised products to the basket, where
the clean method would get a MultipleObjectsReturned exception as the
lookup wasn't taking options into account.

Also fixed a display issue with required options in basket forms.

Also tidied up test case for basket model

* Less DB queries
* Added basic tests

Also split them into unit and functional tests.