Cleanup config handling, redux.
Merge branch 'config_cleanup_take4' into integration

Conflicts:
	Rakefile
	config.rb
	lib/octopress/configuration.rb
	lib/octopress/core_ext.rb
	lib/spec/octopress/core_ext_spec.rb