updates for rails 4

From #39

Conflicts:
	app/controllers/spree/email_sender_controller.rb