Redemption!
Mail stuff for vouchers wip
Merge branch 'master' into voucher-redemption
Merge branch 'master' into voucher-redemption

Conflicts:
	apps/fund/models.py
	apps/fund/serializers.py
	apps/fund/views.py
Small fixes after review
Split Voucher/VoucherRedeem
Tweaks
Merge branch 'master' into voucher-redemption

Conflicts:
	apps/fund/models.py
	apps/fund/views.py
Some tests for putting vouchers in an order
restore 500.html
Fix for process_order_in_progress
Save receiver if authenticated
Try to make a custom request form
Add custom voucher request
Some admin stuff and ember form
Changes after review w/Ben
Merge pull request #209 from onepercentclub/voucher-request-custom

Voucher request custom