Remove unused config options.
Merge remote branch 'origin/trim-config'

Conflicts:
	config.rb