Merge branch 'master' of git://github.com/jshirley/catalyst-action-rest

diff --cc lib/Catalyst/Action/REST.pm
Simple merge

diff --cc lib/Catalyst/Action/SerializeBase.pm
Simple merge