Cleaned up wagtailembeds/tests.py imports
Merge remote-tracking branch 'upstream/master' into feature/styleguide