Remove order sensitivity in specs
Update spec now that bulk product edit is the default product edit view
Adding one additional mailer test
Dropping our override of ActionMailer
Reverting previous commit
Merge branch 'master' into darkswarm

Conflicts:
	spec/features/admin/products_spec.rb
Fixing up the error messages in our specs