Update CHANGELOG and version.rb for 1.2.2
Merge branch '1.2.x' into 1.3.x

Conflicts:
	lib/r10k/version.rb
Update CHANGELOG.mkd and version.rb for 1.3.1
Merge branch '1.3.x'