full_configuration in Rakefile was uninitialized

Switched to a variable instead and reusing it in `integrate` task as well.
Fixed configuration overriding

The deep merge was made the wrong way around
Added initial test coverage
Merge pull request #1021 from gkarekinian/patch-1

full_configuration in Rakefile was uninitialized
Upgrade history to reflect merge of #1021.
Merge pull request #1022 from gkarekinian/patch-2

Fixed configuration overriding
Ruby development console.
Octopress::Configuration is now a class, rather than a module.

The previous system was very unforgiving about where the configuration directory
lay. This commit allows the configuration directory to be set through a config_directory
instance variable on the Octopress::Configuration class, in the event that this directory
ever needs to be changed (e.g. for testing).
Updated Rakefile to handle Octopress::Configuration as a class.
Specifying an exact version for rdiscount.
Testing now in lib/, added a supporting Gemfile and Rakefile
Merge branch '2.1' of git://github.com/imathis/octopress into testing-2.1

Conflicts:
	Rakefile
Add PCC photo.