Fixing issue #252
Merge branch 'master' of https://github.com/qiime/qiime_web_app into agut_issue_252
Checking in more fixes for #252
Merge pull request #260 from meganap/agut_issue_252

Agut issue 252