Added configuration defaults to to configuration.rb
Merge branch '2.1' of git://github.com/imathis/octopress into testing-2.1

Conflicts:
	lib/octopress/configuration.rb