settings3
Merge branch 'master' of https://github.com/jtarlecki/rebate_info

Conflicts:
	rebates/rebates/settings.py