consolidating a bunch of emergency fixes, REST updates, and other crap.
Merge branch 'master' of git://github.com/qiime/qiime_web_app into otu
Merge pull request #495 from douginator2000/otu

Random Stuff
Merge branch 'master' of https://github.com/qiime/qiime_web_app