Oscar 0.6 and Django 1.6 fixes

- Oscar 0.6 fixes
- Import fixes for Django 1.6