Fix silly import errors (always run your tests, Travis)
Move mixins to correct place and make sure ImageField is properly configured