Now runs regular django tests after behave tests.

Also fixed indentation (was mixing tabs and spaces).

Using self.assertFalse(failed) so that --failfast works when running
./manage test
Merge pull request #1 from jdillworth/master

Now runs regular django tests after behave tests.