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

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