Merge spelling test

diff --cc Makefile.PL
Simple merge

diff --cc lib/Catalyst.pm
Simple merge

diff --cc lib/Catalyst/Controller.pm
Simple merge

diff --cc lib/Catalyst/Dispatcher.pm
Simple merge

diff --cc lib/Catalyst/Request.pm
Simple merge

diff --cc lib/Catalyst/Test.pm
Simple merge

diff --cc lib/Catalyst/Upgrading.pod
Simple merge