Removing duplicate settings
Merge branch 'master' of github.com:twisted-infra/codespeed

Conflicts:
	local_settings.py
Adding a syncdb task