We can now arbitrarily add offers and items to landing pages

We still need to edit the checkout template and maybe work some magic
with the urls
Merge branch 'master' into load-custom-templates

Conflicts:
	faucet/views.py