Added color etc to rspec output
* features/step_definitions/merge_steps.rb: Forget the 'Article ID' finder step
Added an unimplemented merge action to the admin content controller