Be more consistent with existing mechanisms:  Move defaults file into theme.
Merge branch 'config_cleanup_take4' into integration

Conflicts:
	Rakefile