before merge form master
before merge
aftermerge
Removing psp from static/js/american_gut.js - it was only on comments, but meh
Remove any psp file from any place on the project
forgot password works
Merge pull request #48 from josenavas/removing-psp

Removing psp
Merge branch 'master' of https://github.com/biocore/american-gut-web into forgot_password_2
remove prints
Merge pull request #49 from teravest/forgot_password_2

Forgot password 2
changes needed for wwwadmin
address @adamrp comments and removed commented out code
fix indent
Merge pull request #50 from teravest/updates_for_wwwadmin

changes needed for wwwadmin