Revert "my settings"

This reverts commit 0d017c751e7f97697cdfda4e670c9d40842add32.

Conflicts:
	fuel_test/settings.py
start() in ocf