Mailers now require a from address, so we need to give defaults

Added Spree::Config[:emails_sent_from] so that people can configure this

Conflicts:
	core/app/mailers/spree/order_mailer.rb
	core/app/mailers/spree/shipment_mailer.rb