Allow the use of local_settings.py to specify configuration.

This is mostly to support a slightly easier supervisor-based cookbook setup.
Merge branch 'feature-settings' into feature-all

Conflicts:
	cabot/cabot_config.py
	cabot/settings.py