default recipeset
Merge branch 'master' into default-recipeset

Conflicts:
	gmailfilterrecipes/client/index.py
Merge pull request #13 from dimagi/default-recipeset

default recipeset