Fetched and updated forgot password
Merge branch 'master' of github.com:biocore/american-gut-web into forgot_password

Conflicts:
	amgut/lib/locale_data/american_gut.py
pulling out email, thanks @antgonza
Merge branch 'master' of github.com:biocore/american-gut-web into forgot_password

Conflicts:
	amgut/lib/locale_data/american_gut.py
Merge pull request #70 from wasade/forgot_password

Fetched and updated forgot password
Merge branch 'master' of github.com:biocore/american-gut-web into construction_locale
conflict resolution