Order edit, index, new
Order edit, index, new
imprint delete button
Added gems used in testing
Shipping Methods to push to show usage
Order index view is all set as far as strictly order information is concerned
Rename needs_redo? to is_redo?
Move partial-specific test code to a separate file
New page is more or less sound
Shipping Methods Features All Done
Shipping Method Model Spec, no need for show, added color to logos
Shipping Methods View Specs
Using default functionality of inherited_resources
Add pending to orders controller and some TODO comments
Merge branch 'develop' into develop-nigel-order-index-view

Conflicts:
	spec/controllers/orders_controller_spec.rb
	spec/spec_helper.rb
	spec/views/orders/index.html.erb_spec.rb
	spec/views/orders/new.html.erb_spec.rb
Moved form specific test logic to _form.html.erb_spec
Forgot to remove piece of hardcoded html (fixed)
Begin work on Imprintables

Complete imprintable index (without styling)
Create imprintables_spec
Complete first Imprintables Management scenario (viewing list)
Using default functionality of inherited_resources
Lots of cleanup and completion; edit page needs reworking