to variables
partial merge of strings
All the strings
touchups
Pulled out static content
removed construction strings
removed construction handler and template
fix wrongly-named variable
Merge branch 'master' of github.com:biocore/american-gut-web into addendum_locale

Conflicts:
	amgut/lib/locale_data/american_gut.py
Merge pull request #96 from squirrelo/fix-help

Fix wrongly-named variable
Merge pull request #87 from wasade/addendum_locale

Addendum locale
Merge pull request #91 from wasade/remove_construction

Remove construction
Merge branch 'master' of github.com:biocore/american-gut-web into dietlogupdates

Conflicts:
	amgut/lib/locale_data/american_gut.py