use haml for mailer
remove old mailer
add payment description to checkout
dubug mail template
fix haml and formatting on confirm email
Merge branch 'master' into payment_description

Conflicts:
	app/views/spree/order_mailer/confirm_email.text.erb