Merge pull request #466 from douginator2000/clippy

Many many odds and ends. Plus Clippy.
Merge branch 'master' of git://github.com/qiime/qiime_web_app into clippy