added a new entry type
added survey_main
food log updates and extra surveys mention
removed diet mentions
Merge branch 'master' of github.com:biocore/american-gut-web into remove_dietlog_stuff

Conflicts:
	amgut/lib/locale_data/british_gut.py
Merge pull request #156 from wasade/remove_dietlog_stuff

Remove dietlog stuff